From 961248d53c414873232f2b9ade0e0754ec18d8fa Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Jan 29 2005 11:02:35 +0000
Subject: make desktop icon themeable (#146486)


---

diff --git a/gimp-2.2.3-icontheme.patch b/gimp-2.2.3-icontheme.patch
new file mode 100644
index 0000000..0986efb
--- /dev/null
+++ b/gimp-2.2.3-icontheme.patch
@@ -0,0 +1,11 @@
+--- gimp-2.2.3/data/misc/gimp.desktop.in.in.icontheme	2004-08-09 13:04:42.000000000 +0200
++++ gimp-2.2.3/data/misc/gimp.desktop.in.in	2005-01-29 11:51:03.516250095 +0100
+@@ -7,7 +7,7 @@
+ _Comment=Create and edit images or photographs
+ Exec=gimp-remote-@GIMP_APP_VERSION@ %U
+ TryExec=gimp-@GIMP_APP_VERSION@
+-Icon=@gimpdatadir@/images/@GIMP_DESKTOP_ICON@
++Icon=gimp.png
+ Terminal=false
+ Categories=Application;Graphics;2DGraphics;RasterGraphics;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
diff --git a/gimp.spec b/gimp.spec
index 15a4aac..b820fd9 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -14,7 +14,7 @@ Version: 	2.2.3
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 	%{?prever:0.0.%{prever}.}1
+Release: 	%{?prever:0.0.%{prever}.}2
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -54,6 +54,7 @@ Requires(postun): /sbin/ldconfig /usr/bin/update-desktop-database
 Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?prever:testing/}gimp-%{version}%{?prever:-%{prever}}.tar.bz2
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
+Patch2:     gimp-2.2.3-icontheme.patch
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -90,6 +91,7 @@ extensions.
 %setup -q -n gimp-%{version}%{?prever:-%{prever}}
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
+%patch2 -p1 -b .icontheme
 
 %build
 libtoolize --copy --force
@@ -134,11 +136,14 @@ export PATH="$PATH:$PWD/bin"
 mkdir -p $RPM_BUILD_ROOT/%{_infodir} $RPM_BUILD_ROOT/%{_includedir} \
 	$RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir} \
         $RPM_BUILD_ROOT/%{_libdir}/gimp/%{interfacever}/plug-ins \
-		$RPM_BUILD_ROOT/%{_datadir}/{applications,application-registry,mime-info,pixmaps}
+		$RPM_BUILD_ROOT/%{_datadir}/{applications,application-registry,mime-info,icons/hicolor/48x48/apps}
 
 # makeinstall macro won't work here - libexec is overriden
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# symlink desktop icon
+ln -s ../../../../gimp/%{interfacever}/images/wilber-icon.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gimp.png
+
 #
 # Plugins and modules change often (grab the executeable ones)
 #
@@ -285,6 +290,8 @@ fi
 #%{_mandir}/man1/escputil-%{interfacever}.1.*
 %{_mandir}/man5/gimprc-%{binver}.5*
 
+%{_datadir}/icons/hicolor/48x48/apps/gimp.png
+
 %files devel
 %defattr (-, root, root, 0755)
 #%{_bindir}/gimp-config-1.4
@@ -302,6 +309,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Jan 29 2005 Nils Philippsen <nphilipp@redhat.com>
+- make desktop icon themeable (#146486)
+
 * Mon Jan 24 2005 Nils Philippsen <nphilipp@redhat.com>
 - version 2.2.3
 - remove exifmarkerlength patch (improved version applied upstream)