rpms/openoffice.org/devel openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, NONE, 1.1 openoffice.org.spec, 1.1260, 1.1261

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15778

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
Log Message:
that's got the be the fix

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

--- NEW FILE openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch ---
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
@@ -224,7 +224,7 @@
 	$nopatchfilecollector = "";
 	
 	$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.1260
retrieving revision 1.1261
diff -u -r1.1260 -r1.1261
--- openoffice.org.spec	21 Aug 2007 10:54:01 -0000	1.1260
+++ openoffice.org.spec	22 Aug 2007 10:10:51 -0000	1.1261
@@ -129,6 +129,7 @@
 Patch64: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
 Patch65: openoffice.org-2.3.0.ooo80735.cppu.map.patch
 Patch66: openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch
+Patch67: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1061,6 +1062,7 @@
 %patch64 -p1 -b .ooo80721.reportdesign.stlportism.patch
 %patch65 -p1 -b .ooo80735.cppu.map.patch
 %patch66 -p1 -b .oooXXXXX.sd.sixtyfour.patch
+%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2717,7 +2719,7 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Aug 21 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.1
+* Wed Aug 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.1
 - Resolves: rhbz#251896 count from start of ctl sequence, not start of
   string when doing range test
 - first 2.3.0 prerelease candidate
@@ -2730,6 +2732,8 @@
   + add openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch for build failure
   + add openoffice.org-2.3.0.ooo80735.cppu.map.patch for ppc64
   + add openoffice.org-2.3.0.oooXXXXX.sd.sixtyfour.patch
+  + add openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch for pesky ppc64 
+    install failure
   + replace openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
     with integrated GenericName support
   + drop integrated workspace.libxslt02.patch