From 5e51270685387a6e26f0b42cf79333748a3d7b49 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Oct 24 2007 08:53:15 +0000
Subject: version 2.4.0 use xdg-open instead of htmlview on Fedora 7 and later change

    hicolor-icon-theme requirement to be "uncolored" (without
    "(post)"/"(postun)") don't let gtk-update-icon-cache fail scriptlets

---

diff --git a/.cvsignore b/.cvsignore
index 988923b..5c3f1c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gimp-2.4.0-rc3.tar.bz2
+gimp-2.4.0.tar.bz2
diff --git a/gimp-2.4.0-xdg-open.patch b/gimp-2.4.0-xdg-open.patch
new file mode 100644
index 0000000..d8b501c
--- /dev/null
+++ b/gimp-2.4.0-xdg-open.patch
@@ -0,0 +1,24 @@
+diff -up gimp-2.4.0/app/config/gimpguiconfig.c.xdg-open gimp-2.4.0/app/config/gimpguiconfig.c
+--- gimp-2.4.0/app/config/gimpguiconfig.c.xdg-open	2007-05-21 10:56:29.000000000 +0200
++++ gimp-2.4.0/app/config/gimpguiconfig.c	2007-10-24 10:43:49.000000000 +0200
+@@ -40,7 +40,7 @@
+ #ifdef G_OS_WIN32
+ #  define DEFAULT_WEB_BROWSER      "not used on Windows"
+ #else
+-#  define DEFAULT_WEB_BROWSER      "firefox %s"
++#  define DEFAULT_WEB_BROWSER      "xdg-open %s"
+ #endif
+ 
+ 
+diff -up gimp-2.4.0/etc/gimprc.xdg-open gimp-2.4.0/etc/gimprc
+--- gimp-2.4.0/etc/gimprc.xdg-open	2007-10-22 21:45:59.000000000 +0200
++++ gimp-2.4.0/etc/gimprc	2007-10-24 10:43:58.000000000 +0200
+@@ -625,7 +625,7 @@
+ # appended to the command with a space separating the two.  This is a single
+ # filename.
+ # 
+-# (web-browser "firefox %s")
++# (web-browser "xdg-open %s")
+ 
+ # The window type hint that is set on the toolbox. This may affect how your
+ # window manager decorates and handles the toolbox window.  Possible values
diff --git a/gimp.spec b/gimp.spec
index 10248cc..4f03ff5 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -22,8 +22,10 @@
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
 %define _enable_gutenprint 0%{!?_without_gutenprint:1}
+%define _enable_xdg_open 0%{!?_without_xdg_open:1}
 %else
 %define _enable_gutenprint 0%{?_with_gutenprint:1}
+%define _enable_xdg_open 0%{?_with_xdg_open:1}
 %endif
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
@@ -40,18 +42,16 @@
 #
 #
 
-
 Summary:        GNU Image Manipulation Program
 Name:           gimp
 Version:        2.4.0
-%define rcver rc3
 %define binver 2.4
 %define gimp_lang_ver 20
 %define interfacever 2.0
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        %{?rcver:0.%{rcver}.}2%{?dist}
+Release:        1%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -111,12 +111,18 @@ Requires:       gimp-print-plugin
 %endif
 %endif
 Requires(post): /usr/bin/update-desktop-database
-Requires(post): hicolor-icon-theme
 Requires(postun):   /usr/bin/update-desktop-database
-Requires(postun):   hicolor-icon-theme
-Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?rcver:testing/}gimp-%{version}%{?rcver:-%{rcver}}.tar.bz2
+Requires:       hicolor-icon-theme
+%if %_enable_xdg_open
+Requires:       xdg-utils
+%else
+Requires:       htmlview
+%endif
+
+Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Source1:        gimp-plugin-mgr.in
 Patch0:         gimp-2.3.18-htmlview.patch
+Patch1:         gimp-2.4.0-xdg-open.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -166,8 +172,12 @@ include convenience symlinks: %_enable_convenience
 
 EOF
 
-%setup -q -n gimp-%{version}%{?rcver:-%{rcver}}
+%setup -q -n gimp-%{version}
+%if %_enable_xdg_open
+%patch1 -p1 -b .xdg-open
+%else
 %patch0 -p1 -b .htmlview
+%endif
 
 %build
 LIBAA="disable"; export LIBAA
@@ -288,8 +298,8 @@ fi
 %post
 /usr/bin/update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 # Then re-add the symlinks
 %{_sbindir}/gimp-plugin-mgr --install '*' || :
@@ -305,8 +315,8 @@ if [ "$1" = "0" ]; then
     /usr/bin/update-desktop-database %{_datadir}/applications || :
 fi
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 %post libs -p /sbin/ldconfig
@@ -429,6 +439,13 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Oct 24 2007 Nils Philippsen <nphilipp@redhat.com> - 2:2.4.0-1
+- version 2.4.0
+- use xdg-open instead of htmlview on Fedora 7 and later
+- change hicolor-icon-theme requirement to be "uncolored" (without
+  "(post)"/"(postun)")
+- don't let gtk-update-icon-cache fail scriptlets
+
 * Fri Sep 07 2007 Nils Philippsen <nphilipp@redhat.com> - 2:2.4.0-0.rc3.2
 - build internal print plugin, don't require external print plugins on Fedora 8
   and later
diff --git a/sources b/sources
index 04a094e..afdc0fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f468ce7c1e3ead678f41b10b28200e60  gimp-2.4.0-rc3.tar.bz2
+35fecf14cd5237065aef624b93030d5e  gimp-2.4.0.tar.bz2