Changeset 191

Timestamp:

10/10/07 01:49:59 (6 years ago)

Author:

bruno

Message:

Debian fixes

Location:

devel/pb

Files:

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

devel/pb/bin/pb

@@ -23 +23 @@
 use lib qw (lib);
 use ProjectBuilder::Distribution qw (pb_distro_init);
-use ProjectBuilder::Changelog qw (pb_changelog);
 use ProjectBuilder::Version qw (pb_version_init);
 use ProjectBuilder::Base qw (pb_conf_read pb_conf_get pb_cms_init pb_mkdir_p pb_system pb_rm_rf pb_get_filters pb_filter_file pb_filter_file_pb pb_cms_export pb_cms_log);
@@ -335 +334 @@
         # Suse < 10.2 forces tar.bz2 usage :-(
         if ($ddir eq "suse") {
+            print "SuSE needs bz2 type of packages so recompressing...\n";
             my $newsrc="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.bz2";
             system "gzip -cd $src | bzip2 -c6 > $newsrc";

devel/pb/contrib/pbsetupqemu

@@ -109 +109 @@
         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 (($ddir eq "suse") && (($dver eq "10.2") || ($dver eq "10.3"))) {
-    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 ($ddir eq "suse") { 
+    # New OpenSuSE
+    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 1> /dev/null 2> /dev/null ; if [ \$\? != 0 ]; then liste=\"\$liste \$i\"; fi; done; echo \"Liste: \$liste\" ; if [ \"\$liste\" != \"\" ]; then yast2 -i \$liste ; fi";
 } elsif ( $dfam eq "md" ) {
     if (( $dver eq "2006.0" ) || ( $dver eq "10.2" )) {
@@ -123 +124 @@
     }
 } elsif ( $dfam eq "du" ) {
-    system "apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev ntp-client libncurses5-dev";
+    system "apt-get update; apt-get -y install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev ntpdate libncurses5-dev libdate-manip-perl libappconfig-perl";
 } elsif ( $dfam eq "gen" ) {
     system "emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs ntp-client";
@@ -134 +135 @@
 
 # Patch AppConfig 
-my $module=`find /usr/lib/perl5 -type f -name File.pm | grep AppConfig/File.pm`;
+my $module=`find /usr/*/perl5 -type f -name File.pm | grep AppConfig/File.pm`;
 chomp($module);
 $found = 0;

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -159 +159 @@
 # Tested
     'gentoo'                => '.* version (.+)',
-    'debian'                => '([^/]+)[/]*.*',
+    'debian'                => '(.+)',
     'slackware'             => 'S[^ ]* (.+)$',
 # There should be no ambiguity between potential ambiguous distro