Changeset 188 in ProjectBuilder

Timestamp:

Oct 8, 2007, 11:51:27 PM (18 years ago)

Author:

Bruno Cornec

Message:

Lots of SuSE fixes

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• contrib/pbsetupqemu (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -333 +333 @@
 
         my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        # Suse < 10.2 forces tar.bz2 usage :-(
+        if ($ddir eq "suse") {
+            my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
+            system "gzip -cd $src | bzip2 -c6 > $newsrc";
+            $src = $newsrc;
+        }
         print $LOG "Source file: $src\n" if ($debug >= 0);
 
@@ -343 +349 @@
             }
 
+            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             # We need to first extract the spec file
-            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
             my @specfile;
             @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
@@ -742 +748 @@
 my @files;
 
-pb_system("tar xfpz $src $dir","Extracting build files");
+if ($src =~ /tar\.gz$/) {
+    pb_system("tar xfpz $src $dir","Extracting build files");
+} elsif ($src =~ /tar\.bz2$/) {
+    pb_system("tar xfpj $src $dir","Extracting build files");
+} else {
+    die "Unknown compression algorithm for $src";
+}
 opendir(DIR,"$dir") || die "Unable to open directory $dir";
 foreach my $f (readdir(DIR)) {

devel/pb/contrib/pbsetupqemu

@@ -110 +110 @@
     }
 } elsif (($ddir eq "suse") && (($dver eq "10.2") || ($dver eq "10.3"))) {
-    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";
+    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";
 } 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"))) {
     # Suppose pkg are installed already
+    system "rpm -e lsb";
     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 .. ";
 } elsif ( $dfam eq "md" ) {

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -171 +171 @@
     'redhat'                => 'Red Hat Linux release (.+) \(',
     'sles'                  => 'SUSE .* Enterprise Server (\d+) \(',
-    'suse'                  => 'SUSE LINUX (\d.+)',
+    'suse'                  => 'SUSE LINUX (\d.+) \(',
     'opensuse'              => 'openSUSE (\d.+) \(',
     'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',