rpms/openoffice.org/devel openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch, 1.1, 1.2

[fedora-cvs-commits redhat com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch 
Log Message:
tweak patch

openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch:
 bin/modules/installer/servicesfile.pm        |    0 
 solenv/bin/modules/installer/servicesfile.pm |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

Index: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch	6 Jul 2005 12:01:24 -0000	1.1
+++ openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch	6 Jul 2005 12:20:13 -0000	1.2
@@ -2,15 +2,15 @@
 ===================================================================
 RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v
 retrieving revision 1.20
-diff -u -r1.20 servicesfile.pm
---- openoffice.org.orig/solenv/bin/modules/installer/servicesfile.pm       17 Jun 2005 09:49:10 -0000 1.20
-+++ openoffice.org/solenv/bin/modules/installer/servicesfile.pm       6 Jul 2005 11:54:02 -0000
-@@ -400,7 +400,7 @@
-                                $counter++;
-                        }
-
--                       if ((( $counter > 0 ) && ( $counter%$installer::globals::unomaxservices == 0 )) || (( $counter > 0 ) && ( $i == $#{$pythoncomponents} )))       # limiting to $installer::globals::maxservices files
-+                       if ( $counter > 0 )
-                        {
-                                $filestring =~ s/\;\s*$//;
-                                $filestring = substr( $filestring, 0, length($filestring)-3);
+diff -u -p -u -r1.20 servicesfile.pm
+--- openoffice.org.orig/solenv/bin/modules/installer/servicesfile.pm	17 Jun 2005 09:49:10 -0000	1.20
++++ openoffice.org/solenv/bin/modules/installer/servicesfile.pm	6 Jul 2005 12:19:41 -0000
+@@ -400,7 +400,7 @@ sub register_pythoncomponents
+ 				$counter++;
+ 			}
+ 			
+-			if ((( $counter > 0 ) && ( $counter%$installer::globals::unomaxservices == 0 )) || (( $counter > 0 ) && ( $i == $#{$pythoncomponents} )))	# limiting to $installer::globals::maxservices files
++			if ( $counter > 0 ) 
+ 			{
+ 				$filestring =~ s/\;\s*$//;
+ 				$filestring = substr( $filestring, 0, length($filestring)-3);