Changeset 181 in ProjectBuilder for devel/pb

Timestamp:

Oct 8, 2007, 12:33:09 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fixes for SLES/SUSE support

Location:

devel/pb

Files:

• contrib/pbsetupqemu (modified) (2 diffs)
• lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)

devel/pb/contrib/pbsetupqemu

@@ -21 +21 @@
 chmod 0644,$file;
 
-    system "userdel pb";
 $file="/etc/passwd";
 open(PBFILE,$file) || die "Unable to open $file";
@@ -109 +108 @@
         system "yum -y $opt install 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";
     }
-} elsif (( $dfam eq "rh" ) || ($ddir eq "sles") || (($ddir eq "suse") && (($dver eq "10.1") || ($dver eq "10.2") || ($dver eq "10.0"))) || (($ddir eq "mandrake") && ($dver eq "10.1"))) {
+} 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";
+} 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 "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 .. ";

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -107 +107 @@
     'fedora'            =>  'fedora-release',       # >= 4
     'vmware'            =>  'vmware-release',       # >= 3
-    'sles'              =>  'sles-release',         # ???
+    'sles'              =>  'sles-release',         # Doesn't exist as of 10
 # Untested
     'knoppix'           =>  'knoppix_version',      #
@@ -167 +167 @@
     'centos'                => '.*CentOS .*release (.+) ',
     'redhat'                => 'Red Hat Linux release (.+) \(',
-    'sles'                  => '.* Enterprise .*\nVERSION = (.+)',
-    'suse'                  => '.* [^Enterpis] .*\nVERSION = (.+)',
+    'sles'                  => 'SUSE .* Enterprise Server (.+)',
+    'suse'                  => '(?:open|)SUSE(?: LINUX|) (\d.+)',
     'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
     'ubuntu'                => '.*Ubuntu.*\nDISTRIB_RELEASE=(.+)',