strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS linuxppcrpm (1.49.90); FILE MERGED

Browse source 
2006/07/02 16:31:24 ericb 1.49.90.1: #i66719# linuxppcrpm make rpm buildable on Debian or Ubuntu distribution
This commit is contained in:
Oliver Bolte 2006-07-10 09:59:57 +00:00
parent 6e6661f2eb
commit 954c60fade
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
solenv/bin/modules/installer/epmfile.pm
View file

@ -4,9 +4,9 @@
#
# $RCSfile: epmfile.pm,v $
#
# $Revision: 1.50 $
# $Revision: 1.51 $
#
# last change: $Author: kz $ $Date: 2006-07-05 21:12:31 $
# last change: $Author: obo $ $Date: 2006-07-10 10:59:57 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -1794,6 +1794,7 @@ sub create_packages_without_epm
if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
if ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
if ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
if ( $installer::globals::compiler =~ /unxlngppc/) {$target = "ppc"; }
my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 |";
@ -1975,6 +1976,7 @@ sub create_new_directory_structure
if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }
if ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
if ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
if ( $installer::globals::compiler =~ /unxlngppc/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/ppc"; }
my $systemcall = "mv $rpmdir/* $newdir"; # moving the rpms into the directory "RPMS"
@ -2000,6 +2002,7 @@ sub create_new_directory_structure
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/sparc");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/ppc");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");
}