rpms/openoffice.org/FC-4 openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch, NONE, 1.1

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Added Files:
	openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch 
Log Message:
missing patch

openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch:
 bin/make_installer.pl                     |    0 
 bin/modules/installer/globals.pm          |    0 
 bin/modules/installer/parameter.pm        |    0 
 solenv/bin/make_installer.pl              |    2 +-
 solenv/bin/modules/installer/globals.pm   |    2 +-
 solenv/bin/modules/installer/parameter.pm |    1 +
 6 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch ---
Index: bin/make_installer.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/make_installer.pl,v
retrieving revision 1.43
diff -u -p -u -r1.43 make_installer.pl
--- openoffice.org.orig/solenv/bin/make_installer.pl	13 May 2005 09:40:50 -0000	1.43
+++ openoffice.org/solenv/bin/make_installer.pl	9 Jun 2005 09:51:48 -0000
@@ -1186,7 +1186,7 @@ for ( my $n = 0; $n <= $#installer::glob
 			# 1. copy all files that need to be stripped locally 
 			# 2. strip all these files
 
-			installer::strip::strip_libraries($filesinpackage, $languagestringref);
+			if ( $installer::globals::strip ) { installer::strip::strip_libraries($filesinpackage, $languagestringref); }
 			if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
 
 			###############################################################
Index: bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.35
diff -u -p -u -r1.35 globals.pm
--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	13 May 2005 09:41:38 -0000	1.35
+++ openoffice.org/solenv/bin/modules/installer/globals.pm	9 Jun 2005 09:51:55 -0000
@@ -151,7 +151,7 @@ BEGIN
 	@linuxlinks = ();
 	@linkrpms = ();
 	
-	$strip = 0;
+	$strip = 1;
 	$solarjava = 0;
 	$jdklib = "";
 	$jrepath = "";
Index: bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.23
diff -u -p -u -r1.23 parameter.pm
--- openoffice.org.orig/solenv/bin/modules/installer/parameter.pm	20 May 2005 07:40:16 -0000	1.23
+++ openoffice.org/solenv/bin/modules/installer/parameter.pm	9 Jun 2005 09:51:58 -0000
@@ -203,6 +203,7 @@ sub getparameter
 		{
 			$installer::globals::simple = 1;
 			$installer::globals::call_epm = 0;
+			$installer::globals::strip = 0;
 			my $path = shift(@ARGV);
 			$path =~ s/^$installer::globals::destdir//;
 			$installer::globals::rootpath = $path;