Changeset 188


Ignore:
Timestamp:
Oct 8, 2007, 11:51:27 PM (13 years ago)
Author:
Bruno Cornec
Message:

Lots of SuSE fixes

Location:
devel/pb
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r180 r188  
    333333
    334334        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
     335        # Suse < 10.2 forces tar.bz2 usage :-(
     336        if ($ddir eq "suse") {
     337            my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
     338            system "gzip -cd $src | bzip2 -c6 > $newsrc";
     339            $src = $newsrc;
     340        }
    335341        print $LOG "Source file: $src\n" if ($debug >= 0);
    336342
     
    343349            }
    344350
     351            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
    345352            # We need to first extract the spec file
    346             symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
    347353            my @specfile;
    348354            @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
     
    742748my @files;
    743749
    744 pb_system("tar xfpz $src $dir","Extracting build files");
     750if ($src =~ /tar\.gz$/) {
     751    pb_system("tar xfpz $src $dir","Extracting build files");
     752} elsif ($src =~ /tar\.bz2$/) {
     753    pb_system("tar xfpj $src $dir","Extracting build files");
     754} else {
     755    die "Unknown compression algorithm for $src";
     756}
    745757opendir(DIR,"$dir") || die "Unable to open directory $dir";
    746758foreach my $f (readdir(DIR)) {
  • devel/pb/contrib/pbsetupqemu

    r185 r188  
    110110    }
    111111} elsif (($ddir eq "suse") && (($dver eq "10.2") || ($dver eq "10.3"))) {
    112     system "yast2 -i neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs ntp perl-AppConfig perl-DateManip";
     112    system "export TERM=linux ; liste="" ; for i in neon newt-devel slang-devel autoconf automake libtool gcc wget gcc-c++ docbook-utils ImageMagick man patch mkisofs perl-DateManip perl-AppConfig perl-File-HomeDir xntp; do rpm -q \$i; if [ \$\? ne 0 ]; then liste=\"\$liste \$i\"; fi; done; yast2 -i \$liste";
    113113} elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.0"))) || (($ddir eq "mandrake") && ($dver eq "10.1"))) {
    114114    # Suppose pkg are installed already
     115    system "rpm -e lsb";
    115116    system "rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf DateManip* ; wget http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-5.46.tar.gz ; tar xvfz Date-Manip-5.46.tar.gz ; cd Date-Manip* ; perl Makefile.PL ; make ; make install ; cd .. ";
    116117} elsif ( $dfam eq "md" ) {
  • devel/pb/lib/ProjectBuilder/Distribution.pm

    r185 r188  
    171171    'redhat'                => 'Red Hat Linux release (.+) \(',
    172172    'sles'                  => 'SUSE .* Enterprise Server (\d+) \(',
    173     'suse'                  => 'SUSE LINUX (\d.+)',
     173    'suse'                  => 'SUSE LINUX (\d.+) \(',
    174174    'opensuse'              => 'openSUSE (\d.+) \(',
    175175    'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
Note: See TracChangeset for help on using the changeset viewer.