rpms/openoffice.org/devel openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.2, 1.3 openoffice.org.spec, 1.1501, 1.1502

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
Log Message:
re-add openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch

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	15 May 2008 13:03:09 -0000	1.3
@@ -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
+@@ -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.1501
retrieving revision 1.1502
diff -u -r1.1501 -r1.1502
--- openoffice.org.spec	15 May 2008 09:22:49 -0000	1.1501
+++ openoffice.org.spec	15 May 2008 13:03:09 -0000	1.1502
@@ -134,6 +134,7 @@
 Patch60: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
 Patch61: openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
 Patch62: openoffice.org-3.0.0.ooo89172.filter.string.patch
+Patch63: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1259,6 +1260,7 @@
 %patch60 -p1 -b .ooo89002.vcl.symbolfonts.patch
 %patch61 -p1 -b .ooo88584.sdext.extraqual.patch
 %patch62 -p1 -b .ooo89172.filter.string.patch
+%patch63 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3383,6 +3385,7 @@
 %changelog
 * Fri May 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.12.1
 - next version
+- re-add openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 * Fri May 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
 - next version