--- a/ChangeLog	Fri Jan 21 06:44:13 2005 +0000
+++ b/ChangeLog	Fri Jan 21 12:32:37 2005 +0000
@@ -1,3 +1,8 @@
+2005-01-21  Damien Carbery <[email protected]>
+
+	* gimp.spec: %ifos linux the PKG_CONFIG_PATH so Solaris one can be 
+	different.
+
 2005-01-21  Srirama Sharma  <[email protected]>
 
 	* gnome-im-switcher.spec: Update

--- a/Solaris/ChangeLog	Fri Jan 21 06:44:13 2005 +0000
+++ b/Solaris/ChangeLog	Fri Jan 21 12:32:37 2005 +0000
@@ -1,3 +1,9 @@
+2005-01-21  Damien Carbery <[email protected]>
+
+	* SUNWjavaapps.spec: Update jEdit %files stuff to 4.2.
+	* SUNWgnome-img-editor.spec: Change PKG_CONFIG_PATH to build gimp-help 
+	module.
+
 2005-01-04  Dermot McCluskey  <[email protected]>
 
 	* SUNWjdsver.spec: updated for build 26

--- a/Solaris/SUNWgnome-img-editor.spec	Fri Jan 21 06:44:13 2005 +0000
+++ b/Solaris/SUNWgnome-img-editor.spec	Fri Jan 21 12:32:37 2005 +0000
@@ -60,7 +60,7 @@
 %gimp.prep -d %name-%version
 
 %build
-export PKG_CONFIG_PATH=%{_pkg_config_path}
+export PKG_CONFIG_PATH=/jds/packages/BUILD/%{name}-%{version}/gimp-%{gimp.subver}.%{gimp.microver}:%{_pkg_config_path}
 export MSGFMT="/usr/bin/msgfmt"
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
@@ -133,6 +133,8 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Jan 21 2005 - [email protected]
+- Change PKG_CONFIG_PATH to build gimp-help module.
 * Mon Dec 13 2004 - [email protected]
 - Move to /usr/sfw to implement ARC decision.
 * Sun Nov 14 2004 - [email protected]

--- a/Solaris/SUNWjavaapps.spec	Fri Jan 21 06:44:13 2005 +0000
+++ b/Solaris/SUNWjavaapps.spec	Fri Jan 21 12:32:37 2005 +0000
@@ -52,7 +52,7 @@
 %dir %attr (0755, root, other) %{_datadir}/jgraphpad-2.2.1.2
 %dir %attr (0755, root, other) %{_datadir}/jdictionary-1.80
 %dir %attr (0755, root, other) %{_datadir}/jdiskreport-1.1
-%dir %attr (0755, root, other) %{_datadir}/jedit-4.1
+%dir %attr (0755, root, other) %{_datadir}/jedit-4.2
 %dir %attr (0755, root, other) %{_datadir}/jspider-1.0
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
@@ -60,10 +60,12 @@
 %{_datadir}/jgraphpad-2.2.1.2/*
 %{_datadir}/jdictionary-1.80/*
 %{_datadir}/jdiskreport-1.1/*
-%{_datadir}/jedit-4.1/*
+%{_datadir}/jedit-4.2/*
 %{_datadir}/jspider-1.0/*
 
 %changelog
+* Fri Jan 21 2005  [email protected]
+- jEdit version now 4.2, so update %files section.
 * Tue Dec 07 2004  [email protected]
 - move /usr/bin -> /usr/demo/jds/bin
 * Wed Nov 10 2004  [email protected]

--- a/gimp.spec	Fri Jan 21 06:44:13 2005 +0000
+++ b/gimp.spec	Fri Jan 21 12:32:37 2005 +0000
@@ -126,7 +126,9 @@
 
 PKG_CONFIG_DISABLE_UNINSTALLED=
 unset PKG_CONFIG_DISABLE_UNINSTALLED
+%ifos linux
 export PKG_CONFIG_PATH=/usr/src/packages/BUILD/gimp-%{subver}.%{microver}:%{_pkg_config_path}
+%endif
 cd gimp-help-2-0.%{help_version}
 	./configure --prefix=%{_prefix}	\
 	    	    --sysconfdir=%{_sysconfdir} \
@@ -236,6 +238,9 @@
 %{_mandir}/man1/gimptool-%{subver}.1*
 
 %changelog
+* Fri Jan 21 2005 - [email protected]
+- %ifos linux the PKG_CONFIG_PATH so Solaris one can be different.
+
 * Sun Jan 16 2005 - [email protected]
 - Set PKG_CONFIG_PATH to build with gimp-help tarball.