Changeset 231 in ProjectBuilder for devel

Timestamp:

Oct 19, 2007, 1:32:43 AM (18 years ago)

Author:

Bruno Cornec

Message:

• backport some spec fixes from 0.8.5
• Fix enhancement #4

Location:

devel

Files:

• pb/bin/pb (modified) (1 diff)
• pb/lib/ProjectBuilder/Base.pm (modified) (5 diffs)
• pbconf/project-builder/rpm/project-builder.spec (modified) (1 diff)

devel/pb/bin/pb

@@ -379 +379 @@
         } elsif ($dtype eq "deb") {
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
-            pb_system("tar xfz $src","Extracting sources");
+            pb_system("tar xpfz $src","Extracting sources");
 
             chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";

devel/pb/lib/ProjectBuilder/Base.pm

@@ -459 +459 @@
 
 my @ffiles;
-my ($ffile0, $ffile1, $ffile2, $ffile3);
-my ($mfile0, $mfile1, $mfile2, $mfile3);
+my ($ffiles00, $ffile0, $ffile1, $ffile2, $ffile3);
+my ($mfiles00, $mfile0, $mfile1, $mfile2, $mfile3);
 my $pbpkg = shift || die "No package specified";
 my $dtype = shift || die "No dtype specified";
@@ -471 +471 @@
 # Global filter files first, then package specificities
 if (-d "$ENV{'PBCONF'}/pbfilter") {
+    $mfile00 = "$ENV{'PBCONF'}/pbfilter/all.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/all.pbf");
     $mfile0 = "$ENV{'PBCONF'}/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dtype.pbf");
     $mfile1 = "$ENV{'PBCONF'}/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$dfam.pbf");
@@ -476 +477 @@
     $mfile3 = "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/pbfilter/$ddir-$dver.pbf");
 
+    push @ffiles,$mfile00 if (defined $mfile00);
     push @ffiles,$mfile0 if (defined $mfile0);
     push @ffiles,$mfile1 if (defined $mfile1);
@@ -483 +485 @@
 
 if (-d "$ENV{'PBCONF'}/$pbpkg/pbfilter") {
+    $ffile00 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/all.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/all.pbf");
     $ffile0 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dtype.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dtype.pbf");
     $ffile1 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dfam.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$dfam.pbf");
@@ -488 +491 @@
     $ffile3 = "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir-$dver.pbf" if (-f "$ENV{'PBCONF'}/$pbpkg/pbfilter/$ddir-$dver.pbf");
 
+    push @ffiles,$ffile00 if (defined $ffile00);
     push @ffiles,$ffile0 if (defined $ffile0);
     push @ffiles,$ffile1 if (defined $ffile1);

devel/pbconf/project-builder/rpm/project-builder.spec

@@ -40 +40 @@
 %install
 make DESTDIR=${RPM_BUILD_ROOT} pure_install
+find ${RPM_BUILD_ROOT} -name perllocal.pod | xargs rm -f
 
 %clean