Author: jajcus Date: Wed Mar 23 10:17:08 2011 GMT Module: packages Tag: HEAD ---- Log message: - Version: 0.9.0 (note: it requires Vala 0.11.7, currently on our DEVEL branch)
---- Files affected: packages/shotwell: shotwell.spec (1.9 -> 1.10) , shotwell-cflags.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/shotwell/shotwell.spec diff -u packages/shotwell/shotwell.spec:1.9 packages/shotwell/shotwell.spec:1.10 --- packages/shotwell/shotwell.spec:1.9 Wed Mar 23 10:21:45 2011 +++ packages/shotwell/shotwell.spec Wed Mar 23 11:17:03 2011 @@ -1,12 +1,13 @@ # $Revision$, $Date$ Summary: Photo manager for GNOME Name: shotwell -Version: 0.8.1 -Release: 3 +Version: 0.9.0 +Release: 1 License: LGPL v2+ and CC-BY-SA Group: X11/Applications -Source0: http://yorba.org/download/shotwell/0.8/%{name}-%{version}.tar.bz2 -# Source0-md5: 378168735006dfe0733431dd47f870c4 +Source0: http://yorba.org/download/shotwell/0.9.0/%{name}-%{version}.tar.bz2 +# Source0-md5: 6701d9a7c0a2f4f720fdeed1d6e54758 +Patch0: %{name}-cflags.patch URL: http://yorba.org/shotwell/ BuildRequires: GConf2-devel >= 2.22.0 BuildRequires: dbus-glib-devel >= 0.80.0 @@ -27,7 +28,7 @@ BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: sqlite3-devel >= 3.5.9 BuildRequires: udev-glib-devel >= 145 -BuildRequires: vala >= 0.8.0 +BuildRequires: vala >= 0.11.7 Requires(post,postun): desktop-file-utils Requires(post,postun): gtk-update-icon-cache Requires(post,postun): hicolor-icon-theme @@ -43,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build ./configure \ @@ -50,6 +52,7 @@ --disable-schemas-install \ --disable-desktop-update \ --disable-icon-update + %{__make} \ CC="%{__cc}" \ CFLAGS="%{rpmcflags}" @@ -60,6 +63,8 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +rm -r $RPM_BUILD_ROOT%{_localedir}/te_IN + %find_lang shotwell --with-gnome %clean @@ -80,11 +85,17 @@ %files -f shotwell.lang %defattr(644,root,root,755) %doc AUTHORS COPYING MAINTAINERS NEWS README THANKS -%attr(755,root,root) %{_bindir}/shotwell -%{_desktopdir}/shotwell-viewer.desktop -%{_desktopdir}/shotwell.desktop -%{_datadir}/shotwell -%{_sysconfdir}/gconf/schemas/shotwell.schemas +%attr(755,root,root) %{_bindir}/%{name} +%{_desktopdir}/%{name}-viewer.desktop +%{_desktopdir}/%{name}.desktop +%{_datadir}/%{name} +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/plugins +%dir %{_libdir}/%{name}/plugins/builtin +%{_libdir}/%{name}/plugins/builtin/*.png +%{_libdir}/%{name}/plugins/builtin/*.glade +%attr(755,root,root) %{_libdir}/%{name}/plugins/builtin/*.so +%{_sysconfdir}/gconf/schemas/%{name}.schemas %{_iconsdir}/hicolor/*/*/*.svg %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -93,6 +104,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.10 2011/03/23 10:17:03 jajcus +- Version: 0.9.0 (note: it requires Vala 0.11.7, currently on our DEVEL branch) + Revision 1.9 2011/03/23 09:21:45 jajcus - Release: 3 (rebuild with new exiv/gexiv) ================================================================ Index: packages/shotwell/shotwell-cflags.patch diff -u /dev/null packages/shotwell/shotwell-cflags.patch:1.1 --- /dev/null Wed Mar 23 11:17:09 2011 +++ packages/shotwell/shotwell-cflags.patch Wed Mar 23 11:17:03 2011 @@ -0,0 +1,26 @@ +diff -dur shotwell-0.9.0.orig/plugins/Makefile.plugin.mk shotwell-0.9.0/plugins/Makefile.plugin.mk +--- shotwell-0.9.0.orig/plugins/Makefile.plugin.mk 2011-03-22 21:46:13.000000000 +0100 ++++ shotwell-0.9.0/plugins/Makefile.plugin.mk 2011-03-23 10:41:40.000000000 +0100 +@@ -32,7 +32,8 @@ + CFILES := $(notdir $(SRC_FILES:.vala=.c)) + OFILES := $(notdir $(SRC_FILES:.vala=.o)) + +-CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` -O2 -g -pipe -fPIC -nostdlib \ ++CFLAGS = -O2 -g ++PLUGIN_CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS)` $(CFLAGS) -pipe -fPIC -nostdlib \ + -export-dynamic + LDFLAGS := `pkg-config --print-errors --libs $(EXT_PKGS)` $(LDFLAGS) + DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"' +@@ -52,10 +53,10 @@ + @ + + $(OFILES): %.o: %.c $(CFILES) +- $(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES) ++ $(CC) -c $(PLUGIN_CFLAGS) $(DEFINES) -I../.. $(CFILES) + + $(PLUGIN).so: $(OFILES) +- $(CC) $(CFLAGS) $(LDFLAGS) $(OFILES) -I../.. -shared -o $@ ++ $(CC) $(PLUGIN_CFLAGS) $(LDFLAGS) $(OFILES) -I../.. -shared -o $@ + + .PHONY: cleantemps + cleantemps: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/shotwell/shotwell.spec?r1=1.9&r2=1.10&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
