rpms/shotwell/devel shotwell.spec,1.24,1.25

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/shotwell/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2184

Modified Files:
	shotwell.spec 
Log Message:
0.6.1



Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- shotwell.spec	7 Jul 2010 16:18:01 -0000	1.24
+++ shotwell.spec	12 Jul 2010 22:27:11 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           shotwell
-Version:        0.5.2
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
 Group:          Applications/Multimedia
@@ -8,7 +8,7 @@ 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.5/shotwell-%{version}.tar.bz2
+Source0:        http://www.yorba.org/download/shotwell/0.6/shotwell-%{version}.tar.bz2
 BuildRequires:  gtk2-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  sqlite-devel
@@ -19,8 +19,12 @@ BuildRequires:  libxml2-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  unique-devel
 BuildRequires:  libexif-devel
+BuildRequires:  libgexiv2-devel
+BuildRequires:  LibRaw-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  webkitgtk-devel
+BuildRequires:  libsoup-devel
+BuildRequires:  libusb-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 
@@ -33,14 +37,13 @@ them, and share them with others.
 %setup -q
 
 %build
-./configure --prefix=/usr --disable-schemas-install
+./configure --prefix=/usr --disable-schemas-install --assume-pkgs
 sed -i -e 's/\\n/\n/g' configure.mk
 sed -i -e 's/^CFLAGS=.*$/CFLAGS=%{optflags}/' Makefile
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 export XDG_DISABLE_MAKEFILE_UPDATES=1
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -52,33 +55,23 @@ desktop-file-validate $RPM_BUILD_ROOT%{_
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
+update-desktop-database &>/dev/null || :
+%gconf_schema_upgrade shotwell
 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
+%gconf_schema_prepare shotwell
 
 %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
+%gconf_schema_remove shotwell
 
 %postun
+update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-update-desktop-database &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
@@ -95,8 +88,8 @@ gtk-update-icon-cache --quiet %{_datadir
 
 
 %changelog
-* Wed Jul  7 2010 Matthias Clasen <mclasen at redhat.com> - 0.5.2-2
-- Rebuild against new webkitgtk and libchamplain
+* Fri Jul  9 2010 Matthias Clasen <mclasen at redhat.com> - 0.6.1-1
+- Update to 0.6.1
 
 * Wed May 12 2010 Matthias Clasen <mclasen at redhat.com> - 0.5.2-1
 - Update to 0.5.2