[gthumb/f14/master] 2.11.90

[Matthias Clasen]

commit 7658e3a2623edabae1bc7845b5d05b9bdc89a122
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Aug 17 13:31:11 2010 -0400

    2.11.90

 .gitignore  |    1 +
 gthumb.spec |   23 +++++++----------------
 sources     |    2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df4a68f..5afb3ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gthumb-2.11.5.tar.bz2
 gthumb-2.11.6.tar.bz2
+/gthumb-2.11.90.tar.bz2
diff --git a/gthumb.spec b/gthumb.spec
index e7c5088..66f7a33 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -12,7 +12,7 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.11.6
+Version: 2.11.90
 Release: 1%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.11/%{name}-%{version}.tar.bz2
@@ -86,8 +86,6 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dyn
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -98,26 +96,16 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
 %find_lang %{name} --with-gnome
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 update-desktop-database -q
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gthumb.schemas > /dev/null || :
+%gconf_schema_upgrade %{name}
 touch --no-create %{_datadir}/icons/hicolor >&/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/gthumb.schemas > /dev/null || :
-fi
+%gconf_schema_prepare %{name}
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gthumb.schemas > /dev/null || :
-fi
+%gconf_schema_remove %{name}
 
 %postun
 update-desktop-database -q
@@ -145,6 +133,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/gthumb-2.12.pc
 
 %changelog
+* Tue Aug 17 2010 Matthias Clasen <mclasen at redhat.com> 2.11.90-1
+- Update to 2.11.90
+
 * Fri Aug  6 2010 Matthias Clasen <mclasen at redhat.com> 2.11.6-1
 - Update to 2.11.6
 
diff --git a/sources b/sources
index 072e645..f77f435 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3929a92a68e6b981bd4eee61e9137c3c  gthumb-2.11.6.tar.bz2
+3f41b39eecce41df0c082847ac210b9f  gthumb-2.11.90.tar.bz2