[gthumb] Update to 3.0.0 (#802954)

Christian Krause chkr at fedoraproject.org
Sun Apr 29 20:04:28 UTC 2012


commit 2565a1ef72f2a4d1aaa1e00ce8c6100330123d2c
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Mon Apr 30 04:03:48 2012 +0800

    Update to 3.0.0 (#802954)
    
    - Remove unused patches

 .gitignore                                        |    1 +
 0001-Enable-building-with-exiv2-0.21-349150.patch |   68 -----------
 gthumb-2.11.1-disable-deprecated.patch            |   36 ------
 gthumb-2.11.2-extension-linking.patch             |  131 ---------------------
 gthumb-cflags.patch                               |   14 ---
 gthumb.spec                                       |   35 +++---
 sources                                           |    2 +-
 7 files changed, 21 insertions(+), 266 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 496ea3b..b6fbd48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ gthumb-2.11.6.tar.bz2
 /gthumb-2.14.1.tar.xz
 /gthumb-2.14.2.tar.xz
 /gthumb-2.14.3.tar.xz
+/gthumb-3.0.0.tar.xz
diff --git a/gthumb.spec b/gthumb.spec
index 470f03a..0cd8ebb 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -1,19 +1,19 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.14.3
+Version: 3.0.0
 Release: 1%{?dist}
 URL: http://gthumb.sourceforge.net
-Source0: http://download.gnome.org/sources/gthumb/2.14/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/gthumb/3.0/%{name}-%{version}.tar.xz
 License: GPLv2+
 Group: User Interface/X
 
-BuildRequires: gtk2-devel 
+BuildRequires: gtk3-devel
 BuildRequires: glib2-devel 
 BuildRequires: GConf2, GConf2-devel
 BuildRequires: unique-devel 
 BuildRequires: exiv2-devel 
 Buildrequires: libopenraw-gnome-devel
-BuildRequires: clutter-gtk010-devel
+BuildRequires: clutter-gtk-devel
 BuildRequires: gstreamer-devel 
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: intltool
@@ -24,9 +24,9 @@ BuildRequires: libtiff-devel
 BuildRequires: libgnome-keyring-devel
 BuildRequires: brasero-devel
 BuildRequires: libsoup-devel
-BuildRequires: automake, autoconf, libtool
 BuildRequires: gnome-common
 BuildRequires: rarian-compat
+BuildRequires: librsvg2-devel
 # For Web albums extension
 BuildRequires: bison flex
 
@@ -58,7 +58,7 @@ rm -f extensions/pixbuf_savers/enum-types.[hc]
 rm -f data/gthumb.schemas
 
 %build
-%configure --disable-libbrasero --enable-libopenraw --disable-static
+%configure --enable-libopenraw --disable-static
 
 # drop unneeded direct library deps with --as-needed
 # libtool doesn't make this easy, so we do it the hard way
@@ -79,30 +79,29 @@ rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
 
 %post
 update-desktop-database &> /dev/null || :
-%gconf_schema_upgrade %{name}
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
-%pre
-%gconf_schema_prepare %{name}
-
-%preun
-%gconf_schema_remove %{name}
-
 %postun
 update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
+if [ $1 -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/gthumb/
+%{_datadir}/glib-2.0/schemas/org.gnome.gthumb*
+%{_datadir}/GConf/gsettings
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/gthumb.png
 %{_datadir}/icons/hicolor/scalable/apps/gthumb.svg
@@ -110,11 +109,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/gthumb-2.14/
-%{_libdir}/pkgconfig/gthumb-2.14.pc
+%{_includedir}/gthumb-3.0/
+%{_libdir}/pkgconfig/gthumb-3.0.pc
 %{_datadir}/aclocal/*
 
 %changelog
+* Sun Apr 29 2012 Christian Krause <chkr at fedoraproject.org> - 3.0.0-1
+- Update to 3.0.0 (#802954)
+- Remove unused patches
+
 * Tue Mar 27 2012 Christian Krause <chkr at fedoraproject.org> - 2.14.3-1
 - Update to 2.14.3
 
diff --git a/sources b/sources
index b1f4121..6ae6978 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d3dbbdb5b712aabdf380943199fddbe  gthumb-2.14.3.tar.xz
+70cc20019cd7fc033b000a1d780d834d  gthumb-3.0.0.tar.xz


More information about the scm-commits mailing list