--- a/j2re-integration.spec Thu Aug 19 12:54:19 2004 +0000
+++ b/j2re-integration.spec Thu Aug 19 13:02:26 2004 +0000
@@ -26,7 +26,7 @@
%define j2re jdk1.5.0
%define j2re_dir %{_prefix}/java/%{j2re}
-Requires: jdk = 1.5.0
+Requires: jdk >= 1.5.0
PreReq: jdk
BuildRequires: jdk
@@ -89,6 +89,9 @@
install --mode=755 -d ${RPM_BUILD_ROOT}%{plugin_dir}
cd ${RPM_BUILD_ROOT}%{plugin_dir}
ln -s ../../../java/j2redefault/plugin/i386/ns7/libjavaplugin_oji.so libjavaplugin_oji.so
+#Remove 0 sized dummy files
+rm $RPM_BUILD_ROOT%{_prefix}/java/jdk1.5.0/bin/java
+rm $RPM_BUILD_ROOT%{_prefix}/java/jdk1.5.0/plugin/i386/ns7/libjavaplugin_oji.so
%clean
rm -rf $RPM_BUILD_ROOT
@@ -132,12 +135,21 @@
%{_prefix}/share/mime-info/*
%{_prefix}/share/application-registry/*
%{_prefix}/share/applications/*
+%{_datadir}/gnome/vfolders/*
%{j2re_dir}/lib/font.properties.*
%{plugin_dir}/libjavaplugin_oji.so
%changelog
* Fri Aug 06 2004 - [email protected]
- Added JavaIM.directory
+
+* Fri Jul 09 2004 - [email protected]
+- Dependency on jdk=1.5.0 breaks with jdk-1.5.0-beta3
+ allow more flexability by specifying jdk >= 1.5.0
+
+* Fri Jul 09 2004 - [email protected]
+- too much crack going on here. tidy up for rpm4
+
* Sun May 30 2004 - [email protected]
- new JDK