[gthumb] New upstream release 3.2.0 (rhbz#860359)

[Christian Krause]

commit b998927019949ca679fac3afe9678784b006a437
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Fri Mar 29 00:17:03 2013 +0100

    New upstream release 3.2.0 (rhbz#860359)
    
    - Remove unused patches
    - Minor cleanup

 .gitignore                                       |    1 +
 0001-exiv2-fixed-crash-if-metadata-is-NULL.patch |   74 ----------------------
 0002-destroy the tool options-widget.patch       |   25 -------
 gthumb.spec                                      |   34 +++++-----
 sources                                          |    2 +-
 5 files changed, 19 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f8f672..d7e25f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ gthumb-2.11.6.tar.bz2
 /gthumb-3.0.0.tar.xz
 /gthumb-3.0.1.tar.xz
 /gthumb-3.0.2.tar.xz
+/gthumb-3.2.0.tar.xz
diff --git a/gthumb.spec b/gthumb.spec
index 1b8acb4..9bf6f94 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -1,18 +1,14 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 3.0.2
-Release: 6%{?dist}
-URL: http://gthumb.sourceforge.net
-Source0: http://download.gnome.org/sources/gthumb/3.0/%{name}-%{version}.tar.xz
-# 2 bugfixes from upstream git 3.0 branch
-Patch1: 0001-exiv2-fixed-crash-if-metadata-is-NULL.patch
-Patch2: 0002-destroy the tool options-widget.patch
+Version: 3.2.0
+Release: 1%{?dist}
+URL: http://live.gnome.org/gthumb
+Source0: http://download.gnome.org/sources/gthumb/3.2/%{name}-%{version}.tar.xz
 License: GPLv2+
 Group: User Interface/X
 
 BuildRequires: gtk3-devel
 BuildRequires: glib2-devel 
-BuildRequires: GConf2, GConf2-devel
 BuildRequires: exiv2-devel 
 Buildrequires: libopenraw-gnome-devel
 BuildRequires: clutter-gtk-devel
@@ -30,15 +26,12 @@ BuildRequires: gnome-common
 BuildRequires: rarian-compat
 BuildRequires: librsvg2-devel
 BuildRequires: gsettings-desktop-schemas-devel
+BuildRequires: itstool
 # For Web albums extension
 BuildRequires: bison flex
 
 Requires: hicolor-icon-theme
 
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-
 %description
 gthumb is an application for viewing, editing, and organizing
 collections of images.
@@ -54,8 +47,6 @@ package.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 # force regeneration
 rm -f extensions/importer/gth-import-enum-types.[hc]
 rm -f extensions/pixbuf_savers/enum-types.[hc]
@@ -105,7 +96,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_bindir}/*
 %{_datadir}/gthumb/
 %{_datadir}/glib-2.0/schemas/org.gnome.gthumb*
-%{_datadir}/GConf/gsettings
+# Co own these directories instead of pulling in GConf
+# after all, we are trying to get rid of GConf with these files
+%dir %{_datadir}/GConf
+%dir %{_datadir}/GConf/gsettings
+%{_datadir}/GConf/gsettings/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/gthumb.png
 %{_datadir}/icons/hicolor/scalable/apps/gthumb.svg
@@ -114,11 +109,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/gthumb-3.0/
-%{_libdir}/pkgconfig/gthumb-3.0.pc
+%{_includedir}/gthumb-3.2/
+%{_libdir}/pkgconfig/gthumb-3.2.pc
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Mar 28 2013 Christian Krause <chkr at fedoraproject.org> - 3.2.0-1
+- New upstream release 3.2.0 (rhbz#860359)
+- Remove unused patches
+- Minor cleanup
+
 * Fri Jan 25 2013 Peter Robinson <pbrobinson at fedoraproject.org> 3.0.2-6
 - Rebuild for new cogl
 
diff --git a/sources b/sources
index 9893cca..a7ba254 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79d128537a19946e6cee8850e8d72abf  gthumb-3.0.2.tar.xz
+c4d85caae04ab6382e3597b07828590e  gthumb-3.2.0.tar.xz