rpms/openoffice.org/devel openoffice.org.spec,1.1128,1.1129

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8671

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#234425 Require java = 1.5.0


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1128
retrieving revision 1.1129
diff -u -r1.1128 -r1.1129
--- openoffice.org.spec	27 Mar 2007 15:03:08 -0000	1.1128
+++ openoffice.org.spec	29 Mar 2007 09:29:26 -0000	1.1129
@@ -163,7 +163,7 @@
 # rpm doesn't "do the right thing" if only the packages are Required.
 Requires: libbluecurve.so, libcrux-engine.so
 %endif
-Requires: libgcj >= 4.0.0, bsh
+Requires: libgcj >= 4.0.0, bsh, java = 1.5.0
 Requires: hsqldb >= 1.80.1, xalan-j2, xerces-j2
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
 Obsoletes: openoffice.org
@@ -993,7 +993,7 @@
 %patch11 -p1 -b .rh151357.setlangtolocale.patch
 %patch12 -p1 -b .rh151356.usetwodotzeropath.patch
 %patch13 -p1 -b .rh156067.noversionedicons.patch
-%patch14 -p1 -b .rhXXXXXX.redhatcolours.extras.patch
+%patch14 -p1
 %if %{gtkprintui}
 %patch15 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
@@ -1142,8 +1142,6 @@
 cd instsetoo_native/util
 #get an unpackaged raw install
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
-ls -asl /usr/share/java/gcj-endorsed
-ls -asl /usr/share/java
 if ! dmake openoffice_en-US; then
     echo - ---dump log start---
     cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log