--- a/ChangeLog	Sun Sep 18 10:18:16 2005 +0000
+++ b/ChangeLog	Sun Sep 18 10:58:00 2005 +0000
@@ -1,3 +1,12 @@
+2005-09-18  Glynn Foster  <[email protected]>
+
+	* gimp.spec: Update.
+	* patches/gimp-01-menu-entry.diff: Update patch.
+	* patches/gimp-02-poppler-api.diff: Rename.
+	* patches/gimp-02-remove-keys.diff: Remove - we're using the new
+	MIME system now, so there's better ways of doing this.
+	* patches/gimp-03-poppler.c.diff: Remove.
+
 2005-09-18  Glynn Foster  <[email protected]>
 
 	* gnome-session.spec: Update to fix some more FIXMEs.

--- a/gimp.spec	Sun Sep 18 10:18:16 2005 +0000
+++ b/gimp.spec	Sun Sep 18 10:58:00 2005 +0000
@@ -22,8 +22,7 @@
 Source:       ftp://ftp.gimp.org/pub/%{name}/v%{subver}/%{name}-%{version}.tar.bz2
 Source1:      ftp://ftp.gimp.org/pub/%{name}/help/testing/gimp-help-2-0.%{help_version}.tar.bz2
 Patch1:       gimp-01-menu-entry.diff
-Patch2:       gimp-02-remove-keys.diff
-Patch3:       gimp-03-poppler.c.diff
+Patch2:       gimp-02-poppler-api.diff
 URL:          http://www.gimp.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -90,12 +89,10 @@
 
 %prep
 %setup -q
-#FIXME: needs rework: %patch1 -p1
-#FIXME: needs rework: %patch2 -p1
-%patch3 -p1
+%patch1 -p1
+%patch2 -p1
 /usr/bin/bzcat -dc %SOURCE1|tar xf -
 
-
 %build
 %ifos linux
 if [ -x /usr/bin/getconf ]; then

--- a/patches/gimp-01-menu-entry.diff	Sun Sep 18 10:18:16 2005 +0000
+++ b/patches/gimp-01-menu-entry.diff	Sun Sep 18 10:58:00 2005 +0000
@@ -1,17 +1,12 @@
---- ../gimp-2.2.7.old/data/misc/gimp.desktop.in.in	2005-06-10 14:49:19.264754712 +0100
-+++ ./data/misc/gimp.desktop.in.in	2005-06-10 14:54:06.557079640 +0100
+diff -urNp gimp-2.3.3/desktop/gimp.desktop.in.in gimp-2.3.3-hacked/desktop/gimp.desktop.in.in
+--- gimp-2.3.3/desktop/gimp.desktop.in.in	2005-06-17 02:50:43.000000000 +1200
++++ gimp-2.3.3-hacked/desktop/gimp.desktop.in.in	2005-09-18 22:40:51.313749144 +1200
 @@ -2,7 +2,7 @@
  Version=1.0
  Encoding=UTF-8
  Type=Application
--_Name=The GIMP
+-_Name=GNU Image Manipulation Program
 +_Name=Image Editor
  _GenericName=Image Editor
- _Comment=Create and edit images or photographs
+ _Comment=Create images and edit photographs
  Exec=gimp-remote-@GIMP_APP_VERSION@ %U
-@@ -13,4 +13,4 @@
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=GIMP
- StartupNotify=true
--MimeType=image/bmp;image/g3fax;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-compressed-xcf;image/x-fits;image/x-gray;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-sun-raster;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-xwindowdump;
-+MimeType=image/g3fax;image/tiff;image/x-compressed-xcf;image/x-fits;image/x-gray;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-sun-raster;image/x-tga;image/x-xbitmap;image/x-xcf;image/x-xpixmap;image/x-xwindowdump;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gimp-02-poppler-api.diff	Sun Sep 18 10:58:00 2005 +0000
@@ -0,0 +1,22 @@
+--- gimp-2.3.3/plug-ins/common/poppler.c.orig	2005-08-21 18:05:17.309165096 +0100
++++ gimp-2.3.3/plug-ins/common/poppler.c	2005-08-21 18:06:56.785042464 +0100
+@@ -487,8 +487,7 @@
+       poppler_page_render_to_pixbuf (page, 0, 0,
+                                      width, height,
+                                      scale,
+-                                     buf,
+-                                     0, 0);
++                                     buf);
+ 
+       g_object_get (G_OBJECT (page), "label", &page_label, NULL);
+ 
+@@ -539,8 +538,7 @@
+       poppler_page_render_to_pixbuf (page, 0, 0,
+                                      width, height,
+                                      scale,
+-                                     pixbuf,
+-                                     0, 0);
++                                     pixbuf);
+     }
+ 
+   g_object_unref (page);

--- a/patches/gimp-02-remove-keys.diff	Sun Sep 18 10:18:16 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
---- ../gimp-2.2.7.old/data/misc/gimp.keys.in	2005-06-10 14:49:19.275753040 +0100
-+++ ./data/misc/gimp.keys.in	2005-06-10 14:53:18.151438416 +0100
-@@ -1,41 +1,13 @@
--# also image/x-bmp
--image/bmp
--	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
--
- image/g3fax
- 	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
- 	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
- 	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
- 
--image/gif
--	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
--
--image/jpeg
--	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
--
--# also image/x-png
--image/png
--	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
--
- image/tiff
- 	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
- 	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
- 	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
- 
--# also image/bmp
--image/x-bmp
--	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
--
- image/x-compressed-xcf
- 	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
- 	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
-@@ -46,12 +18,6 @@
- 	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
- 	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
- 
--# also image/png
--image/x-png
--	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@
--	short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@
--
- image/x-portable-anymap
- 	short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@
- 	short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@

--- a/patches/gimp-03-poppler.c.diff	Sun Sep 18 10:18:16 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- gimp-2.3.3/plug-ins/common/poppler.c.orig	2005-08-21 18:05:17.309165096 +0100
-+++ gimp-2.3.3/plug-ins/common/poppler.c	2005-08-21 18:06:56.785042464 +0100
-@@ -487,8 +487,7 @@
-       poppler_page_render_to_pixbuf (page, 0, 0,
-                                      width, height,
-                                      scale,
--                                     buf,
--                                     0, 0);
-+                                     buf);
- 
-       g_object_get (G_OBJECT (page), "label", &page_label, NULL);
- 
-@@ -539,8 +538,7 @@
-       poppler_page_render_to_pixbuf (page, 0, 0,
-                                      width, height,
-                                      scale,
--                                     pixbuf,
--                                     0, 0);
-+                                     pixbuf);
-     }
- 
-   g_object_unref (page);