rpms/shotwell/devel desktopfile.patch, NONE, 1.1 gconftool.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 shotwell.spec, 1.3, 1.4 sources, 1.2, 1.3

Tue Nov 3 21:33:47 UTC 2009

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12893

Modified Files:
	.cvsignore shotwell.spec sources 
Added Files:
	desktopfile.patch gconftool.patch 
Log Message:
0.3.0


desktopfile.patch:
 shotwell-viewer.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE desktopfile.patch ---
diff -up shotwell-0.3.0/misc/shotwell-viewer.desktop.desktopfile shotwell-0.3.0/misc/shotwell-viewer.desktop
--- shotwell-0.3.0/misc/shotwell-viewer.desktop.desktopfile	2009-11-03 16:26:46.601060436 -0500
+++ shotwell-0.3.0/misc/shotwell-viewer.desktop	2009-11-03 16:27:11.099785337 -0500
@@ -9,6 +9,6 @@ Icon=shotwell
 Terminal=false
 NoDisplay=true
 Type=Application
-MimeType=image/jpeg
+MimeType=image/jpeg;
 Categories=Graphics;Viewer;Photography;GNOME;GTK;
 X-GIO-NoFuse=true

gconftool.patch:
 Makefile |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE gconftool.patch ---
diff -up shotwell-0.3.0/Makefile.gconftool shotwell-0.3.0/Makefile
--- shotwell-0.3.0/Makefile.gconftool	2009-11-02 17:33:12.000000000 -0500
+++ shotwell-0.3.0/Makefile	2009-11-03 16:17:16.719784336 -0500
@@ -14,7 +14,7 @@ BUILD_RELEASE=1
 
 SUPPORTED_LANGUAGES=fr
 LOCAL_LANG_DIR=locale-langpack
-SYSTEM_LANG_DIR=/usr/share/locale-langpack
+SYSTEM_LANG_DIR=$(DESTDIR)$(PREFIX)/share/locale
 
 -include configure.mk
 
@@ -161,9 +161,9 @@ VALA_LDFLAGS = `pkg-config --libs $(EXT_
 # setting CFLAGS in configure.mk overrides build type
 ifndef CFLAGS
 ifdef BUILD_DEBUG
-CFLAGS = -g -O0
+CFLAGS=-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
 else
-CFLAGS = -g -O2 -mfpmath=sse -march=nocona
+CFLAGS=-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
 endif
 endif
 
@@ -213,14 +213,14 @@ install:
 	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
 	mkdir -p $(DESTDIR)/usr/share/icons/hicolor/scalable/apps
 	$(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps
-	-update-icon-caches $(DESTDIR)/usr/share/icons/hicolor
+	-gtk-update-icon-cache $(DESTDIR)/usr/share/icons/hicolor || :
 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/ui
 	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
 	$(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)/usr/share/applications
 	$(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)/usr/share/applications
-	-update-desktop-database
-	GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool --makefile-install-rule misc/shotwell.schemas
-	-killall -HUP gconfd-2
+	-update-desktop-database || :
+	GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule misc/shotwell.schemas
+	-killall -HUP gconfd-2 || :
 	-$(foreach lang,$(SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
         $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
             $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
@@ -231,9 +231,9 @@ uninstall:
 	rm -fr $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/shotwell.svg
 	rm -f $(DESTDIR)/usr/share/applications/shotwell.desktop
 	rm -f $(DESTDIR)/usr/share/applications/shotwell-viewer.desktop
-	-update-desktop-database
-	GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool --makefile-uninstall-rule misc/shotwell.schemas
-	killall -HUP gconfd-2
+	-update-desktop-database || :
+	GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule misc/shotwell.schemas
+	killall -HUP gconfd-2 || :
 	$(foreach lang,$(SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
 
 $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	13 Aug 2009 00:13:10 -0000	1.2
+++ .cvsignore	3 Nov 2009 21:33:45 -0000	1.3
@@ -1 +1 @@
-shotwell-0.2.0.tar.bz2
+shotwell-0.3.0.tar.bz2


Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- shotwell.spec	20 Aug 2009 21:30:56 -0000	1.3
+++ shotwell.spec	3 Nov 2009 21:33:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           shotwell
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -8,7 +8,11 @@ Group:          Applications/Multimedia
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
 URL:            http://www.yorba.org/shotwell/
-Source0:        http://www.yorba.org/download/shotwell/0.2/shotwell-0.2.0.tar.bz2
+Source0:        http://www.yorba.org/download/shotwell/0.3/shotwell-0.3.0.tar.bz2
+
+Patch0:		gconftool.patch
+Patch1:		desktopfile.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -30,6 +34,8 @@ them, and share them with others.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gconftool
+%patch1 -p1 -b .desktopfile
 
 %build
 ./configure --prefix=/usr
@@ -43,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications
 make install DESTDIR=$RPM_BUILD_ROOT
+install -D misc/shotwell.schemas $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/shotwell.schemas
 
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell-viewer.desktop
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,6 +62,20 @@ rm -rf $RPM_BUILD_ROOT
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database &> /dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/shotwell.schemas > /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/shotwell.schemas > /dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/shotwell.schemas > /dev/null || :
+fi
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -63,16 +87,21 @@ update-desktop-database &> /dev/null || 
 %posttrans
 gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING MAINTAINERS NEWS THANKS AUTHORS
+%{_sysconfdir}/gconf/schemas/shotwell.schemas
 %{_bindir}/shotwell
 %{_datadir}/shotwell
 %{_datadir}/applications/shotwell.desktop
+%{_datadir}/applications/shotwell-viewer.desktop
 %{_datadir}/icons/hicolor/scalable/apps/shotwell.svg
 
 
 %changelog
+* Tue Nov  3 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.0-1
+- Version 0.3.0
+
 * Thu Aug 20 2009 Michel Salim <salimma at fedoraproject.org> - 0.2.0-3
 - Rebuild against new libgee
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	13 Aug 2009 00:13:10 -0000	1.2
+++ sources	3 Nov 2009 21:33:45 -0000	1.3
@@ -1 +1 @@
-2ea693170b4285d30015366d8c2844af  shotwell-0.2.0.tar.bz2
+6da3d40d4a57a581238f86284bbaae75  shotwell-0.3.0.tar.bz2


