--- a/gimp.spec	Thu Aug 19 12:54:19 2004 +0000
+++ b/gimp.spec	Thu Aug 19 13:02:26 2004 +0000
@@ -1,5 +1,5 @@
-%define subver 1.3
-%define microver 18
+%define subver 2.0
+%define microver 2
 
 Name:         gimp
 License:      GPL, LGPL
@@ -9,25 +9,23 @@
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GIMP (GNU Image Manipulation Program)
-Source:       ftp://ftp.gimp.org/pub/gimp/v1.3/v1.3.18/gimp-%{version}.tar.bz2
+Source:       ftp://ftp.gimp.org/pub/gimp/v2.1/gimp-%{version}.tar.bz2
 Source1: gimp-l10n-po-1.2.tar.bz2
 Patch1:       gimp-01-menu-entry.diff
-Patch2:       gimp-02-enable-deprecated-stuff.diff
-Patch3:       gimp-03-remove-keys.diff
-Patch4:       gimp-04-solx86.diff
+Patch2:       gimp-02-remove-keys.diff
 URL:          http://www.gimp.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
 Autoreqprov:  on
 
-%define glib2_version 2.2.3
-%define gtk2_version 2.2.4
-%define libmng_version 1.0.4
-%define libgimpprint_version 4.3.3
-%define libpng_version 1.2.4
+%define glib2_version 2.4.1
+%define gtk2_version 2.4.1
+%define libmng_version 1.0.6
+%define libgimpprint_version 4.2.6
+%define libpng_version 1.2.5
 %define libjpeg_version 6.2.0
 %define libungif_version 4.1.0
-%define slang_version 1.4.5
+%define slang_version 1.4.9
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -80,8 +78,7 @@
 /usr/bin/bzcat -dc %SOURCE1|tar xf -
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
 
 %build
 %ifos linux
@@ -125,6 +122,9 @@
 mv ${RPM_BUILD_ROOT}%{_datadir}/gimp/%{subver}/misc/gimp.desktop ${RPM_BUILD_ROOT}%{_datadir}/applications/gimp-%{subver}.desktop
 mv ${RPM_BUILD_ROOT}%{_datadir}/gimp/%{subver}/misc/gimp.applications ${RPM_BUILD_ROOT}%{_datadir}/application-registry/gimp-%{subver}.applications
 mv ${RPM_BUILD_ROOT}%{_datadir}/gimp/%{subver}/misc/gimp.keys ${RPM_BUILD_ROOT}%{_datadir}/mime-info/gimp-%{subver}.keys
+#clean up unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/%{subver}/modules/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -144,8 +144,7 @@
 %{_bindir}/gimp-%{subver}
 %{_bindir}/gimp-remote*
 
-%{_libdir}/lib*-%{subver}.so.%{microver}
-%{_libdir}/lib*-%{subver}.so.%{microver}.0.0
+%{_libdir}/lib*-%{subver}.so.*
 %{_libdir}/pkgconfig/gimp-%{subver}.pc
 %{_libdir}/pkgconfig/gimpui-%{subver}.pc
 
@@ -176,7 +175,7 @@
 %{_datadir}/locale
 
 %{_sysconfdir}/gimp/%{subver}/gimprc
-%{_sysconfdir}/gimp/%{subver}/gtkrc_user
+%{_sysconfdir}/gimp/%{subver}/gtkrc
 %{_sysconfdir}/gimp/%{subver}/ps-menurc
 %{_sysconfdir}/gimp/%{subver}/sessionrc
 %{_sysconfdir}/gimp/%{subver}/templaterc
@@ -193,6 +192,8 @@
 %defattr (0755, root, root)
 %{_bindir}/gimptool-%{subver}
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+
 %dir %{_libdir}/gimp/%{subver}/modules
 
 %defattr (0644, root, root)
@@ -201,6 +202,10 @@
 %{_mandir}/man1/gimptool-%{subver}.1*
 
 %changelog
+* Fri Jul 16 2004 - [email protected]
+- Finally bumped to 2.0.x series (2.0.2)
+- packaging fixes for rpm4 and remove upstream patches
+
 * Tue Jul 13 2004 - [email protected]
 - Remove '-j $CPUS' from 'make' because of failures on Solaris and intermittent
   failures on Linux.