rpms/shotwell/F-12 prefixly-correct.patch, NONE, 1.1 shotwell.spec, 1.3, 1.4 sources, 1.2, 1.3

Matthias Clasen mclasen at fedoraproject.org
Fri Dec 4 01:40:59 UTC 2009 

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5115

Modified Files:
	shotwell.spec sources 
Added Files:
	prefixly-correct.patch 
Log Message:
0.3.2


prefixly-correct.patch:
 Makefile |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE prefixly-correct.patch ---
diff -up shotwell-0.3.2/Makefile.desktop-file-install shotwell-0.3.2/Makefile
--- shotwell-0.3.2/Makefile.desktop-file-install	2009-11-12 11:13:43.728916255 -0500
+++ shotwell-0.3.2/Makefile	2009-11-12 11:15:35.467916317 -0500
@@ -212,16 +212,16 @@ install:
 	$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
 	$(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
+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
+	$(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
 ifndef XDG_DISABLE_MAKEFILE_UPDATES
-	-gtk-update-icon-cache $(DESTDIR)/usr/share/icons/hicolor || :
+	-gtk-update-icon-cache $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
 endif
 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/ui
 	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
-	mkdir -p $(DESTDIR)$(PREFIX)/usr/share/applications
-	$(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)/usr/share/applications
-	$(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)/usr/share/applications
+	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
 ifndef XDG_DISABLE_MAKEFILE_UPDATES
 	-update-desktop-database || :
 endif
@@ -238,9 +238,9 @@ endif
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
 	rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
-	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
+	rm -fr $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/shotwell.svg
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell.desktop
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell-viewer.desktop
 ifndef XDG_DISABLE_MAKEFILE_UPDATES
 	-update-desktop-database || :
 endif


Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/F-12/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	4 Dec 2009 01:40:59 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           shotwell
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.2
+Release:        2%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -8,10 +8,12 @@ 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-%{version}.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
+BuildRequires:  GConf2-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  vala-devel
 BuildRequires:  libgee-devel
@@ -21,7 +23,9 @@ BuildRequires:  unique-devel
 BuildRequires:  libexif-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 
+Patch0: prefixly-correct.patch
 
 %description
 Shotwell is a new open source photo organizer designed for the GNOME desktop
@@ -30,21 +34,25 @@ them, and share them with others.
 
 %prep
 %setup -q
+%patch0 -p1 -b .prefixly-correct
 
 %build
 ./configure --prefix=/usr
 sed -i -e 's/\\n/\n/g' configure.mk
-sed -i -e 's/^CFLAGS = .*$/CFLAGS=%{optflags}/' Makefile
+sed -i -e 's/^CFLAGS=.*$/CFLAGS=%{optflags}/' Makefile
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+export XDG_DISABLE_MAKEFILE_UPDATES=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
 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 +60,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 +85,24 @@ 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
+* Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> - 0.3.2-1
+- Update to 0.3.2
+
+* 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/F-12/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	4 Dec 2009 01:40:59 -0000	1.3
@@ -1 +1 @@
-2ea693170b4285d30015366d8c2844af  shotwell-0.2.0.tar.bz2
+9415fcceb9663de6815dd805f45c0905  shotwell-0.3.2.tar.bz2

More information about the scm-commits mailing list