--- a/ChangeLog	Thu Apr 01 21:54:31 2004 +0000
+++ b/ChangeLog	Thu Apr 01 22:03:28 2004 +0000
@@ -1,3 +1,10 @@
+2004-04-10  Brian Cameron  <[email protected]>
+
+	* gimp.spec: - replace tar jxf with the more solaris friendly
+	  bzcat piped through tar.  Now pass ACLOCAL_FLAGS into
+	  aclocal.  Added EXTRA_CONFIGURE_OPTIONS to allow Solaris
+	  to pass in --disable-print.  Fixed a few defattr lines.
+
 2004-04-10  Brian Cameron  <[email protected]>
 
 	* gnomemeeting.spec, pwlib.spec, patches/pwlib-02-forte-makefiles.diff,

--- a/Solaris/ChangeLog	Thu Apr 01 21:54:31 2004 +0000
+++ b/Solaris/ChangeLog	Thu Apr 01 22:03:28 2004 +0000
@@ -1,3 +1,7 @@
+2004-04-01  Brian Cameron  <[email protected]>
+
+	* SUNWgnome-img-editor.spec:  Added.
+
 2004-03-29  Brian Cameron  <[email protected]>
 
 	* SUNWgnome-character-map.spec: Corrected install of man pages

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/SUNWgnome-img-editor.spec	Thu Apr 01 22:03:28 2004 +0000
@@ -0,0 +1,118 @@
+#
+# spec file for package SUNWgnome-image-edit
+#
+# includes module(s): gimp
+#
+# Copyright (c) 2004 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+%include Solaris.inc
+
+%use gimp = gimp.spec
+
+Name:                    SUNWgnome-image-edit
+Summary:                 GNOME Image Editor
+Version:                 2.6.0
+SUNW_BaseDir:            %{_prefix}
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+
+%include default-depend.inc
+Requires: SUNWgnome-image-edit-share
+Requires: SUNWgnome-libs
+Requires: SUNWgnome-base-libs
+
+%package share
+Summary:                 GNOME Image Editor - platform independent files, /usr/share
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+Requires: SUNWpl5u
+
+%package root
+Summary:                 GNOME Image Editor - platform dependent files, / filesystem
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+
+%package devel
+Summary:                 GNOME Image Editor - developer files
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+
+%package devel-share
+Summary:                 GNOME Image Editor - developer files - platform independent, /usr/share
+SUNW_BaseDir:            %{_prefix}
+%include default-depend.inc
+
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+%gimp.prep -d %name-%version
+
+%build
+export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export MSGFMT="/usr/bin/msgfmt"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
+export CFLAGS="%optflags -I%{_includedir}"
+export RPM_OPT_FLAGS="$CFLAGS"
+export LDFLAGS="-L%{_libdir} -R%{_libdir}"
+export EXTRA_CONFIGURE_OPTIONS="--disable-print"
+
+%gimp.build -d %name-%version
+
+%install
+%gimp.install -d %name-%version
+
+%clean
+#rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, other)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, bin) %{_libdir}/gimp
+%dir %attr (0755, root, bin) %{_libdir}/gimp/1.3
+%dir %attr (0755, root, bin) %{_libdir}/gimp/1.3/environ
+%dir %attr (0755, root, bin) %{_libdir}/gimp/1.3/modules
+%dir %attr (0755, root, bin) %{_libdir}/gimp/1.3/plug-ins
+%{_libdir}/gimp/1.3/environ/*
+%{_libdir}/gimp/1.3/modules/lib*.so*
+%{_libdir}/gimp/1.3/plug-ins/*
+
+%files share
+%defattr (-, root, other)
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/application-registry
+%{_datadir}/applications
+%{_datadir}/gimp
+%{_datadir}/locale
+%{_datadir}/mime-info
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/*
+%{_mandir}/*/*
+
+%files root
+%defattr (-, root, other)
+%dir %attr (0755, root, sys) %{_sysconfdir}
+%{_sysconfdir}/*
+
+%files devel
+%defattr (0755, root, other)
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%{_libdir}/pkgconfig
+
+%files devel-share
+%defattr (0755, root, other)
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %{_datadir}/gtk-doc
+%{_datadir}/aclocal
+%{_datadir}/gtk-doc
+
+%changelog
+* Fri Mar 26 2004 - [email protected]
+- Created,

--- a/gimp.spec	Thu Apr 01 21:54:31 2004 +0000
+++ b/gimp.spec	Thu Apr 01 22:03:28 2004 +0000
@@ -75,24 +75,28 @@
 
 %prep
 %setup -q
-tar -jxf %SOURCE1
+/usr/bin/bzcat -dc %SOURCE1|tar xf -
 %patch1 -p1
 %patch2 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS"			\
 libtoolize --force
-aclocal -I %{_datadir}/aclocal/gnome2-macros
+aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
 automake -a -c -f
 autoconf
-./configure --prefix=%{_prefix}		\
+# EXTRA_CONFIGURE_OPTIONS allows passing in --disable-print
+# from Solaris spec file, since we are not currently building
+# libgimpprint
+./configure --prefix=%{_prefix} $EXTRA_CONFIGURE_OPTIONS \
 	    --sysconfdir=%{_sysconfdir} \
 	    --libexecdir=%{_libexecdir} \
 	    --localstatedir=/var/lib	\
 	    --mandir=%{_mandir}		\
 	    --enable-mp			\
 	    --enable-gtk-doc		\
-	    --enable-default-binary	    
+	    --enable-default-binary	   \
+		--disable-gtk-doc 
 make 
 
 %install
@@ -168,17 +172,23 @@
 
 %files devel
 
-%defattr (0755, root, root, 0755)
+%defattr (0755, root, root)
 %{_bindir}/gimptool-%{subver}
 %{_libdir}/*.so
 %dir %{_libdir}/gimp/%{subver}/modules
 
-%defattr (0644, root, root, 0755)
+%defattr (0644, root, root)
 %{_datadir}/aclocal/gimp-2.0.m4
 %{_includedir}/gimp-%{subver}/
 %{_mandir}/man1/gimptool-%{subver}.1*
 
 %changelog
+* Thu Apr 01 2004 - [email protected]
+- replace tar jxf with the more solaris friendly
+  bzcat piped through tar.  Now pass ACLOCAL_FLAGS into
+  aclocal.  Added EXTRA_CONFIGURE_OPTIONS to allow Solaris
+  to pass in --disable-print.  Fixed a few defattr lines.
+
 * Mon Mar 29 2004 - [email protected]
 - Adding gimp-l10n-po-1.0.tar.bz2 l10n content