--- a/ChangeLog	Wed Apr 21 14:23:57 2004 +0000
+++ b/ChangeLog	Wed Apr 21 15:18:56 2004 +0000
@@ -1,3 +1,7 @@
+2004-04-21  Dermot McCluskey  <[email protected]>
+
+	* j2re-integration.spec: Changed to use j2sdk 1.5.0
+
 2004-04-21  Ghee Teo <[email protected]>
 
 	* Updated nautilus.spec to build whatever is possible and send out 

--- a/j2re-integration.spec	Wed Apr 21 14:23:57 2004 +0000
+++ b/j2re-integration.spec	Wed Apr 21 15:18:56 2004 +0000
@@ -3,35 +3,35 @@
 Group:        		Development/Tools
 BuildArchitectures:     noarch
 Version:      		0.0.3
-Release:      		231
-Distribution: 		Mercury
+Release:      		232
+Distribution: 		Java Desktop System
 Vendor:       		Sun Microsystems, Inc.
-Summary:      		Java integration for Mercury.
-Source:				font.properties.zh_CN.Sun
-Source1:			font.properties.zh_CN_UTF8.Sun
-Source2:			font.properties.zh_HK.Sun
-Source3:			font.properties.zh_HK_UTF8.Sun
-Source4:			font.properties.zh_TW.Sun
-Source5:			font.properties.zh_TW_UTF8.Sun
-Source6:                        javaws.mime
-Source7:                        javaws.keys
-Source8:                        javaws.applications
-Source9:                        runjim.desktop
-Source10:                       jimregis.desktop
-Source11:                       JavaIM.directory
-URL:          		http://www.gnome.org
+Summary:      		Java integration
+Source:			font.properties.zh_CN.Sun
+Source1:		font.properties.zh_CN_UTF8.Sun
+Source2:		font.properties.zh_HK.Sun
+Source3:		font.properties.zh_HK_UTF8.Sun
+Source4:		font.properties.zh_TW.Sun
+Source5:		font.properties.zh_TW_UTF8.Sun
+Source6:                javaws.mime
+Source7:                javaws.keys
+Source8:                javaws.applications
+Source9:                runjim.desktop
+Source10:               jimregis.desktop
+Source11:               JavaIM.directory
+URL:          		http://www.sun.com
 BuildRoot:    		%{_tmppath}/%{name}-%{version}-build
 
 %define plugin_dir %{_libdir}/mozilla/plugins
-%define j2re j2re1.4.2_04
+%define j2re j2sdk1.5.0
 %define j2re_dir %{_prefix}/java/%{j2re}
 
-Requires:               j2re = 1.4.2_04-fcs
-PreReq:                 j2re
-BuildRequires:          j2re
+Requires:               j2sdk = 1.5.0
+PreReq:                 j2sdk
+BuildRequires:          j2sdk
 
 %description
-Java integration for Mercury
+Java integration.
 
 %prep
 %setup -T -c -n j2re-integration
@@ -70,7 +70,7 @@
 
 #Setup relative symlinks
 
-#Link j2re... to j2redefault
+#Link j2sdk1.5.0... to j2redefault
 install --mode=755 -d ${RPM_BUILD_ROOT}%{_prefix}/java/%{j2re}
 cd ${RPM_BUILD_ROOT}%{_prefix}/java
 ln -s %{j2re} j2redefault
@@ -135,6 +135,9 @@
 %{plugin_dir}/libjavaplugin_oji.so
 
 %changelog
+* Tue Apr 20 2004 - [email protected]
+- switched from jre 1.4.2_04 to j2sdk 1.5.0
+
 * Mon Jan 19 2004 - [email protected]
 - Rev'd J2re to _04