rpms/shotwell/devel shotwell.spec,1.23,1.24 sources,1.12,1.13

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	shotwell.spec sources 
Log Message:
Rebuild



Index: shotwell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/shotwell.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- shotwell.spec	7 Jul 2010 05:11:59 -0000	1.23
+++ shotwell.spec	7 Jul 2010 16:18:01 -0000	1.24
@@ -1,5 +1,5 @@
 Name:           shotwell
-Version:        0.5.90
+Version:        0.5.2
 Release:        2%{?dist}
 Summary:        A photo organizer for the GNOME desktop
 
@@ -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/unstable/shotwell-%{version}.tar.bz2
+Source0:        http://www.yorba.org/download/shotwell/0.5/shotwell-%{version}.tar.bz2
 BuildRequires:  gtk2-devel
 BuildRequires:  GConf2-devel
 BuildRequires:  sqlite-devel
@@ -19,12 +19,8 @@ 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
 
@@ -44,6 +40,7 @@ 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
@@ -55,23 +52,33 @@ 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
-%gconf_schema_prepare shotwell
+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
-%gconf_schema_remove shotwell
+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
-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 || :
@@ -88,12 +95,8 @@ gtk-update-icon-cache --quiet %{_datadir
 
 
 %changelog
-* Wed Jul  7 2010 Matthias Clasen <mclasen at redhat.com> - 0.5.90-2
-- Rebuild against newer webkitgtk
-
-* Wed May 26 2010 Matthias Clasen <mclasen at redhat.com> - 0.5.90-1
-- Update to 0.5.90
-- Scriptlet updates
+* Wed Jul  7 2010 Matthias Clasen <mclasen at redhat.com> - 0.5.2-2
+- Rebuild against new webkitgtk and libchamplain
 
 * Wed May 12 2010 Matthias Clasen <mclasen at redhat.com> - 0.5.2-1
 - Update to 0.5.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shotwell/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	7 Jul 2010 04:27:58 -0000	1.12
+++ sources	7 Jul 2010 16:18:01 -0000	1.13
@@ -1 +1 @@
-bbce5a9dca206b2608b763630093490d  shotwell-0.5.90.tar.bz2
+a347765f3a6ae8408a97d559ed50b0b8  shotwell-0.5.2.tar.bz2