Changeset 540

Timestamp:

09/15/08 13:11:19 (5 years ago)

Author:

bruno

Message:

Fix #32 for RPMS based packages

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/Env.pm (modified) (4 diffs)

devel/pb/bin/pb

@@ -541 +541 @@
         $pb{'rev'} = $pbrev;
         $pb{'ver'} = $pbver;
+        $pb{'pkg'} = $pbpkg;
         $pb{'date'} = $pbdate;
         $pb{'defpkgdir'} = $defpkgdir;
@@ -560 +561 @@
 
             # We need to compute the real name of the package
-            my $pbpkgreal = pb_cms_get_real_pkg($pbpkg,$pb{'dtype'});
-            $pb{'pkg'} = $pbpkgreal;
+            my $pbrealpkg = pb_cms_get_real_pkg($pbpkg,$pb{'dtype'});
+            $pb{'realpkg'} = $pbrealpkg;
 
             # Filter build files from the less precise up to the most with overloading
@@ -783 +784 @@
                 }
             }
-            $made="$made RPMS/*/$pbpkg-$pbver-$pbtag$pbsuf.*.rpm SRPMS/$pbpkg-$pbver-$pbtag$pbsuf.src.rpm";
+            # Get the name of the generated packages
+            open(LOG,"$ENV{'PBTMP'}/system.log") || die "Unable to open $ENV{'PBTMP'}/system.log";
+            while (<LOG>) {
+                chomp();
+                next if ($_ !~ /^Wrote:/);
+                s|.*/([S]*RPMS.*)|$1|;
+                $made="$made $_";
+            }
+
             if (-f "/usr/bin/rpmlint") {
                 pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");

devel/pb/lib/ProjectBuilder/Env.pm

@@ -484 +484 @@
 # PBSRC is replaced by the source package location after the repo
 #filter PBSRC = src/%{name}-%{version}.tar.gz
+# Used if virtual name != real name (perl, ...)
+#filter PBSRC = src/%{srcname}-%{version}.tar.gz
 
 # PBVER is replaced by the version (\$pb->{'ver'} in code)
@@ -505 +507 @@
 # PBREV is replaced by the revision (\$pb->{'rev'} in code)
 filter PBREV = \$pb->{'rev'}
+
+# PBREALPKG is replaced by the package name (\$pb->{'realpkg'} in code)
+filter PBREALPKG = \$pb->{'realpkg'}
 
 # PBPKG is replaced by the package name (\$pb->{'pkg'} in code)
@@ -842 +847 @@
 # $Id$
 #
+# Used if virtual name != real name (perl, ...)
+#%define srcname    PBPKG
 
 Summary:        bla-bla
 Summary(fr):    french bla-bla
 
-Name:           PBPKG
+Name:           PBREALPKG
 Version:        PBVER
 Release:        PBTAGPBSUF
@@ -865 +872 @@
 %prep
 %setup -q
+# Used if virtual name != real name (perl, ...)
+#%setup -q -n %{srcname}-%{version}
 #PBPATCHCMD