rpms/openoffice.org/devel openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.1, 1.2 openoffice.org.spec, 1.1058, 1.1059

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 
	openoffice.org.spec 
Log Message:
fuck you gcj and the horse you rode in on

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 |    2 +-
 4 files changed, 2 insertions(+), 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	23 Feb 2007 11:03:38 -0000	1.1
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch	23 Feb 2007 16:15:48 -0000	1.2
@@ -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	23 Feb 2007 11:02:01 -0000
++++ openoffice.org/solenv/bin/modules/installer/globals.pm	23 Feb 2007 15:48:04 -0000
 @@ -256,7 +256,7 @@
  	@solarispatchfiles = (".diPatch", "patchinfo");
  	@environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" );
@@ -14,3 +14,19 @@
  	@regcompregisterlibs = ( "javavm.uno", "javaloader.uno", "uriproc.uno" );
  	@languagepackfeature =();
  	@featurecollector =();
+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	23 Feb 2007 16:12:39 -0000
+@@ -258,7 +258,7 @@
+ 					$counter++;
+ 				}
+ 			
+-				if ((( $counter > 0 ) && ( $counter%$installer::globals::javamaxservices == 0 )) || (( $counter > 0 ) && ( $i == $#{$javacomponents} )))	# limiting to $installer::globals::maxservices files
++				if ( $counter > 0 )
+ 				{
+ 					$filestring =~ s/\;\s*$//;
+ 					chdir($onesourcepath);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1058
retrieving revision 1.1059
diff -u -r1.1058 -r1.1059
--- openoffice.org.spec	23 Feb 2007 15:09:53 -0000	1.1058
+++ openoffice.org.spec	23 Feb 2007 16:15:48 -0000	1.1059
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 8
-%define rh_rpm_release 5
+%define rh_rpm_release 4
 
 # gcc#19664#
 %define stlvisibilityfcked 1