[gthumb/f13/master] - Spec file cleanup - Add BR for Web albums extension (#620707) - Fix compilation against new libbra

[chkr]

commit cd92369f626326ca70d9efa04818e117e2ec23ec
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sun Aug 22 19:33:54 2010 +0200

    - Spec file cleanup
    - Add BR for Web albums extension (#620707)
    - Fix compilation against new libbrasero-burn

 .gitignore  |    2 ++
 gthumb.spec |   54 ++++++++++++++++++++++++++++++++----------------------
 sources     |    2 +-
 3 files changed, 35 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52260bb..5afb3ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +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 2d5b5ed..606eebf 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -1,8 +1,6 @@
 
 %define gtk2_version 2.16.0
 %define glib2_version 2.16.0
-%define desktop_file_utils_version 0.9
-%define gconf_version 2.14
 %define unique_version 1.1.2
 %define openraw_version 0.0.8
 %define exiv2_version 0.18
@@ -12,8 +10,8 @@
 
 Summary: Image viewer, editor, organizer
 Name: gthumb
-Version: 2.11.5
-Release: 1%{?dist}
+Version: 2.11.90
+Release: 3%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.11/%{name}-%{version}.tar.bz2
 
@@ -22,7 +20,7 @@ Group: User Interface/X
 
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: GConf2-devel
+BuildRequires: GConf2, GConf2-devel
 BuildRequires: unique-devel >= %{unique_version}
 BuildRequires: exiv2-devel >= %{exiv2_version}
 BuildRequires: libopenraw-gnome-devel >= %{openraw_version}
@@ -38,17 +36,17 @@ BuildRequires: libtiff-devel
 BuildRequires: libgnome-keyring-devel
 BuildRequires: brasero-devel
 BuildRequires: libsoup-devel
-
 BuildRequires: automake, autoconf, libtool
 BuildRequires: gnome-common
-
 BuildRequires: rarian-compat
+# For Web albums extension
+BuildRequires: bison flex
 
-Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
-Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
-Requires(pre): GConf2 >= %{gconf_version}
-Requires(post): GConf2 >= %{gconf_version}
-Requires(preun): GConf2 >= %{gconf_version}
+Requires: hicolor-icon-theme
+
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 %description
 gthumb is an application for viewing, editing, and organizing
@@ -99,9 +97,8 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 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 || :
+update-desktop-database &> /dev/null || :
+%gconf_schema_upgrade %{name}
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
@@ -117,7 +114,7 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-update-desktop-database -q
+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 || :
@@ -127,21 +124,34 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 %files -f %{name}.lang
-%defattr(-,root,root)
-
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
-%{_datadir}/gthumb
+%{_datadir}/gthumb/
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/gthumb.png
 %{_datadir}/icons/hicolor/scalable/apps/gthumb.svg
-%{_libdir}/gthumb
+%{_libdir}/gthumb/
 
 %files devel
-%{_includedir}/gthumb-2.12
+%defattr(-,root,root,-)
+%{_includedir}/gthumb-2.12/
 %{_libdir}/pkgconfig/gthumb-2.12.pc
 
 %changelog
+* Sun Aug 22 2010 Christian Krause <chkr at fedoraproject.org> - 2.11.90-3
+- Fix compilation against new libbrasero-burn
+
+* Sun Aug 22 2010 Christian Krause <chkr at fedoraproject.org> - 2.11.90-2
+- Spec file cleanup
+- Add BR for Web albums extension (#620707)
+
+* 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
+
 * Mon Jul 12 2010 Matthias Clasen <mclasen at redhat.com> - 2.11.5-1
 - Update to 2.11.5
 
@@ -394,7 +404,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 * Wed Sep 29 2004 Ray Strode <rstrode at redhat.com> 2.4.2-2
 - Move gthumb.desktop to redhat-menus (#131726)
 - Require recent desktop-file-utils
-- Call update-desktop-database from %postun
+- Call update-desktop-database from %%postun
 
 * Mon Sep 13 2004 Christopher Aillon <caillon at redhat.com> 2.4.2-1
   - gthumb.desktop: Add supported mime types (#131740)
diff --git a/sources b/sources
index a3716cb..f77f435 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da7689e63a94732e06896ebdc32ab3ac  gthumb-2.11.5.tar.bz2
+3f41b39eecce41df0c082847ac210b9f  gthumb-2.11.90.tar.bz2