--- a/gimp.spec	Tue Aug 23 13:36:50 2005 +0000
+++ b/gimp.spec	Tue Aug 23 16:46:21 2005 +0000
@@ -20,9 +20,10 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GIMP (GNU Image Manipulation Program)
 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.gz
+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
 URL:          http://www.gimp.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -87,8 +88,9 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+#FIXME: needs rework: %patch1 -p1
+#FIXME: needs rework: %patch2 -p1
+%patch3 -p1
 /usr/bin/bzcat -dc %SOURCE1|tar xf -
 
 
@@ -152,12 +154,6 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-./mkinstalldirs $RPM_BUILD_ROOT%{_datadir}/applications
-./mkinstalldirs $RPM_BUILD_ROOT%{_datadir}/application-registry
-./mkinstalldirs $RPM_BUILD_ROOT%{_datadir}/mime-info
-mv ${RPM_BUILD_ROOT}%{_datadir}/gimp/%{subver_install}/misc/gimp.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/gimp-%{subver}.desktop
-mv ${RPM_BUILD_ROOT}%{_datadir}/gimp/%{subver_install}/misc/gimp.applications ${RPM_BUILD_ROOT}%{_datadir}/application-registry/gimp-%{subver}.applications
-mv ${RPM_BUILD_ROOT}%{_datadir}/gimp/%{subver_install}/misc/gimp.keys ${RPM_BUILD_ROOT}%{_datadir}/mime-info/gimp-%{subver}.keys
 #clean up unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/%{subver_install}/modules/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -180,8 +176,9 @@
 
 %doc %{_datadir}/gtk-doc/html/
 
+%{_bindir}/gimp
 %{_bindir}/gimp-%{subver}
-%{_bindir}/gimp
+%{_bindir}/gimp-console*
 %{_bindir}/gimp-remote*
 
 %{_libdir}/lib*-%{subver_install}.so.*
@@ -197,6 +194,8 @@
 %{_libdir}/gimp/%{subver_install}/environ/*
 %{_libdir}/gimp/%{subver_install}/modules/*.so
 %{_libdir}/gimp/%{subver_install}/plug-ins/*
+%{_libdir}/gimp/%{subver_install}/interpreters
+%{_libdir}/gimp/%{subver_install}/python
 
 %{_datadir}/gimp/%{subver_install}/brushes/
 %{_datadir}/gimp/%{subver_install}/fractalexplorer/
@@ -212,10 +211,11 @@
 %{_datadir}/gimp/%{subver_install}/tips/
 %{_datadir}/gimp/%{subver_install}/help/
 %{_datadir}/gimp/%{subver_install}/menus/
-%{_datadir}/applications/gimp-%{subver}.desktop
-%{_datadir}/application-registry/gimp-%{subver}.applications
-%{_datadir}/mime-info/gimp-%{subver}.keys
+%{_datadir}/applications/gimp.desktop
+%{_datadir}/application-registry/gimp.applications
+%{_datadir}/mime-info/gimp.keys
 %{_datadir}/locale
+%{_datadir}/icons
 
 %{_sysconfdir}/gimp/%{subver_install}/gimprc
 %{_sysconfdir}/gimp/%{subver_install}/gtkrc