Author: jajcus Date: Wed Mar 28 07:57:23 2012 GMT Module: packages Tag: HEAD ---- Log message: - build & install fixes - Release: 1
---- Files affected: packages/shotwell: shotwell-cflags.patch (1.3 -> 1.4) , shotwell.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: packages/shotwell/shotwell-cflags.patch diff -u packages/shotwell/shotwell-cflags.patch:1.3 packages/shotwell/shotwell-cflags.patch:1.4 --- packages/shotwell/shotwell-cflags.patch:1.3 Sun Sep 4 22:44:41 2011 +++ packages/shotwell/shotwell-cflags.patch Wed Mar 28 09:57:18 2012 @@ -1,27 +1,13 @@ -diff -Nur shotwell-0.11.0.orig/plugins/Makefile.plugin.mk shotwell-0.11.0/plugins/Makefile.plugin.mk ---- shotwell-0.11.0.orig/plugins/Makefile.plugin.mk 2011-08-23 19:19:18.000000000 +0100 -+++ shotwell-0.11.0/plugins/Makefile.plugin.mk 2011-09-04 21:31:10.000000000 +0100 -@@ -32,8 +32,8 @@ - CFILES := $(notdir $(SRC_FILES:.vala=.c)) - OFILES := $(notdir $(SRC_FILES:.vala=.o)) +--- shotwell-0.12.0/Makefile.orig 2012-03-27 22:59:45.000000000 +0200 ++++ shotwell-0.12.0/Makefile 2012-03-28 09:23:30.000000000 +0200 +@@ -424,8 +424,8 @@ + CFLAGS = -O0 -g -pipe + PLUGIN_CFLAGS = -O0 -g -pipe + else +-CFLAGS = -O2 -g -pipe +-PLUGIN_CFLAGS = -O2 -g -pipe ++CFLAGS = $(RPMCFLAGS) ++PLUGIN_CFLAGS = $(RPMCFLAGS) + endif + endif --CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS) --LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS) -+LOCAL_CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS) -+LOCAL_LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS) - DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"' - - all: $(PLUGIN).so -@@ -51,10 +51,10 @@ - @ - - $(OFILES): %.o: %.c $(CFILES) -- $(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES) -+ $(CC) -c $(LOCAL_CFLAGS) $(DEFINES) -I../.. $(CFILES) - - $(PLUGIN).so: $(OFILES) -- $(CC) $(CFLAGS) -Wl,--no-as-needed $(LDFLAGS) $(OFILES) -I../.. -shared -o $@ -+ $(CC) $(LOCAL_CFLAGS) -Wl,--no-as-needed $(LOCAL_LDFLAGS) $(OFILES) -I../.. -shared -o $@ - - .PHONY: cleantemps - cleantemps: ================================================================ Index: packages/shotwell/shotwell.spec diff -u packages/shotwell/shotwell.spec:1.27 packages/shotwell/shotwell.spec:1.28 --- packages/shotwell/shotwell.spec:1.27 Wed Mar 28 09:11:03 2012 +++ packages/shotwell/shotwell.spec Wed Mar 28 09:57:18 2012 @@ -2,7 +2,7 @@ Summary: Photo manager for GNOME Name: shotwell Version: 0.12.0 -Release: 0.1 +Release: 1 License: LGPL v2+ and CC-BY-SA Group: X11/Applications Source0: http://yorba.org/download/shotwell/0.12/%{name}-%{version}.tar.bz2 @@ -10,7 +10,6 @@ Patch0: %{name}-cflags.patch URL: http://yorba.org/shotwell/ # The dependencies are listed in Makefile -BuildRequires: GConf2-devel >= 3.0 BuildRequires: bash BuildRequires: gettext-devel BuildRequires: glib2-devel >= 2.30.0 @@ -29,6 +28,7 @@ BuildRequires: libxml2-devel >= 1:2.6.32 BuildRequires: m4 BuildRequires: pkgconfig +BuildRequires: rest-devel >= 0.7 BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: sqlite3-devel >= 3.5.9 BuildRequires: udev-glib-devel >= 145 @@ -37,7 +37,6 @@ Requires(post,postun): desktop-file-utils Requires(post,postun): gtk-update-icon-cache Requires(post,postun): hicolor-icon-theme -Requires(post,preun): GConf2 Requires: hicolor-icon-theme BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -49,7 +48,7 @@ %prep %setup -q -#%patch0 -p1 +%patch0 -p1 %build # this is not autoconf generated @@ -62,8 +61,7 @@ %{__make} \ CC="%{__cc}" \ - CFLAGS="%{rpmcflags}" \ - PLUGIN_CFLAGS="%{rpmcflags}" + RPMCFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT @@ -71,22 +69,23 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# not in glibc +rm -r $RPM_BUILD_ROOT%{_localedir}/{ta_IN,te_IN} + %find_lang shotwell --with-gnome %find_lang shotwell-extras cat shotwell.lang shotwell-extras.lang > shotwell-all.lang +rm $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/gschemas.compiled + %clean rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install shotwell.schemas %update_icon_cache hicolor %update_desktop_database -%preun -%gconf_schema_uninstall shotwell.schemas - %postun %update_icon_cache hicolor %update_desktop_database_postun @@ -114,6 +113,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2012/03/28 07:57:18 jajcus +- build & install fixes +- Release: 1 + Revision 1.27 2012/03/28 07:11:03 jajcus - Version: 0.12.0 - Release: 0.1 (NFY) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/shotwell/shotwell-cflags.patch?r1=1.3&r2=1.4 http://cvs.pld-linux.org/packages/shotwell/shotwell.spec?r1=1.27&r2=1.28 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
