SPECS: openoffice.org.spec - jvmsetup does not exist - jdk 1.5 is ...

[baggins]

Author: baggins                      Date: Fri Jan 13 23:00:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- jvmsetup does not exist
- jdk 1.5 is good

---- Files affected:
SPECS:
   openoffice.org.spec (1.579 -> 1.580) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.579 SPECS/openoffice.org.spec:1.580
--- SPECS/openoffice.org.spec:1.579	Fri Jan 13 23:55:12 2006
+++ SPECS/openoffice.org.spec	Sat Jan 14 00:00:30 2006
@@ -176,7 +176,6 @@
 %endif
 %if %{with java}
 BuildRequires:	jdk >= 1.4.0_00
-BuildRequires:	jdk < 1.5.0_00
 BuildRequires:	db-java >= 4.2.52-4
 BuildRequires:	jar
 BuildRequires:	jakarta-ant
@@ -2123,7 +2122,6 @@
 
 %if %{without java}
 # Java-releated bits
-rm -f $RPM_BUILD_ROOT%{_sbin}/oojvmsetup
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/javascript
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/Scripts/beanshell
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/xslt
@@ -2281,9 +2279,7 @@
 %attr(755,root,root) %{_libdir}/%{name}/program/*.py
 
 %if %{with java}
-%attr(755,root,root) %{_sbindir}/oojvmsetup
 %attr(755,root,root) %{_libdir}/%{name}/program/javaldx
-%attr(755,root,root) %{_libdir}/%{name}/program/jvmsetup
 %attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
 %attr(755,root,root) %{_libdir}/%{name}/program/jvmfwk3rc
 %{_libdir}/%{name}/program/classes
@@ -2351,6 +2347,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.580  2006/01/13 23:00:30  baggins
+- jvmsetup does not exist
+- jdk 1.5 is good
+
 Revision 1.579  2006/01/13 22:55:12  baggins
 - set proper ANT_HOME
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.579&r2=1.580&f=u