rpms/openoffice.org/devel openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.5, 1.6 openoffice.org.spec, 1.1771, 1.1772

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28625

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
Log Message:
still getting the randomesque java failures

openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:

Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
===================================================================
RCS file: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
diff -N openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	24 Jan 2009 22:48:22 -0000	1.6
@@ -0,0 +1,16 @@
+Index: bin/modules/installer/globals.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
+retrieving revision 1.62.2.3
+diff -u -r1.62.2.3 globals.pm
+--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	24 Jan 2007 16:34:05 -0000	1.62.2.3
++++ openoffice.org/solenv/bin/modules/installer/globals.pm	27 Feb 2007 17:25:53 -0000
+@@ -305,7 +305,7 @@
+ 	%moduledestination = ();
+ 	
+ 	$unomaxservices = 25;
+-	$javamaxservices = 15;
++	$javamaxservices = 1;
+ 	
+ 	$one_cab_file = 0;
+ 	$fix_number_of_cab_files = 1;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1771
retrieving revision 1.1772
diff -u -r1.1771 -r1.1772
--- openoffice.org.spec	24 Jan 2009 14:49:18 -0000	1.1771
+++ openoffice.org.spec	24 Jan 2009 22:48:22 -0000	1.1772
@@ -134,6 +134,7 @@
 Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
 Patch64: openoffice.org-3.0.1.ooo98240.sc.basicworkaround.patch
 Patch65: openoffice.org-3.0.1.ooo98288.ucb.neonchange.patch
+Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1420,6 +1421,7 @@
 %patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
 %patch64 -p1 -b .ooo98240.sc.basicworkaround.patch
 %patch65 -p1 -b .ooo98288.ucb.neonchange.patch
+%patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`