rpms/openoffice.org/devel openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.7, 1.8 openoffice.org.spec, 1.1079, 1.1080

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
	openoffice.org.spec 
Log Message:
ah, I give up, maybe tom can fix this when he gets back from holidays

openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:
 bin/modules/installer/globals.pm             |    0 
 bin/modules/installer/servicesfile.pm        |    0 
 solenv/bin/modules/installer/globals.pm      |    2 +-
 solenv/bin/modules/installer/servicesfile.pm |    1 -
 4 files changed, 1 insertion(+), 2 deletions(-)

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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	28 Feb 2007 11:21:11 -0000	1.7
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	28 Feb 2007 16:58:45 -0000	1.8
@@ -4,7 +4,7 @@
 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
++++ openoffice.org/solenv/bin/modules/installer/globals.pm	28 Feb 2007 16:56:30 -0000
 @@ -224,7 +224,7 @@
  	$nopatchfilecollector = "";
  	
@@ -14,3 +14,18 @@
  	
  	$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
+ 					{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1079
retrieving revision 1.1080
diff -u -r1.1079 -r1.1080
--- openoffice.org.spec	28 Feb 2007 11:21:11 -0000	1.1079
+++ openoffice.org.spec	28 Feb 2007 16:58:45 -0000	1.1080
@@ -1085,7 +1085,6 @@
 cd ../..
 
 cd instsetoo_native/util
-build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s
 if ! build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s; then
     build --dlv_switch -link --all
 fi
@@ -1119,7 +1118,7 @@
 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
+export CLASSPATH=/usr/share/java/xml-commons-apis.jar
 if ! dmake openoffice_en-US; then
     echo - ---dump log start---
     cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
@@ -1847,7 +1846,7 @@
 %{instdir}/program/soffice
 %{instdir}/program/soffice.bin
 %{instdir}/program/libsoffice.so
-%config(noreplace) %{instdir}/program/sofficerc
+%{instdir}/program/sofficerc
 %{instdir}/program/spadmin
 %{instdir}/program/spadmin.bin
 %{instdir}/program/streams.uno.so