rpms/openoffice.org/devel openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.9, 1.10 openoffice.org.spec, 1.1104, 1.1105

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
	openoffice.org.spec 
Log Message:
testtools fails

openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:
 build.lst |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	5 Mar 2007 08:39:37 -0000	1.9
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	13 Mar 2007 19:25:02 -0000	1.10
@@ -1,34 +1,3 @@
-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	28 Feb 2007 16:56:30 -0000
-@@ -224,7 +224,7 @@
- 	$nopatchfilecollector = "";
- 	
- 	$unomaxservices = 25;
--	$javamaxservices = 15;
-+	$javamaxservices = 1;
- 	
- 	$one_cab_file = 0;
- 	$fix_number_of_cab_files = 1;
-Index: bin/modules/installer/servicesfile.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v
-retrieving revision 1.23
-diff -u -r1.23 servicesfile.pm
---- openoffice.org.orig/solenv/bin/modules/installer/servicesfile.pm	10 Jul 2006 18:51:00 -0000	1.23
-+++ openoffice.org/solenv/bin/modules/installer/servicesfile.pm	28 Feb 2007 16:56:32 -0000
-@@ -283,7 +283,6 @@
- 					if ($returnvalue)
- 					{
- 						$infoline = "ERROR: $systemcall\n";
--						$error_occured = 1;
- 					}
- 					else
- 					{
 --- openoffice.org.orig/postprocess/prj/build.lst	2007-03-05 08:39:30.000000000 +0000
 +++ openoffice.org/postprocess/prj/build.lst	2007-03-05 08:39:39.000000000 +0000
 @@ -1,4 +1,4 @@


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1104
retrieving revision 1.1105
diff -u -r1.1104 -r1.1105
--- openoffice.org.spec	13 Mar 2007 14:55:33 -0000	1.1104
+++ openoffice.org.spec	13 Mar 2007 19:25:02 -0000	1.1105
@@ -1040,7 +1040,7 @@
 %patch64 -p1 -b .ooo74401.basctl.boost.patch
 %patch65 -p1 -b .workspace.configrefactor01.patch
 %patch66 -p1 -b .workspace.sixtyfour11.patch
-#%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch67 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 %patch68 -p1 -b .ooo68717.gstreamer.video.patch
 %patch69 -p1 -b .ooo63159.sal.dtype.patch
 %patch70 -p1 -b .ooo75167.framework.workspacerestore.patch
@@ -1124,7 +1124,6 @@
 cd instsetoo_native/util
 #get an unpackaged raw install
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
-export CLASSPATH=/usr/share/java/xml-commons-apis.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/xalan-j2.jar:/usr/share/java/dom3-xerces-j2.jar
 ls -asl /usr/share/java/gcj-endorsed
 ls -asl /usr/share/java
 if ! dmake openoffice_en-US; then