Changeset 279 in ProjectBuilder

Timestamp:

Nov 12, 2007, 3:18:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

Attempt to solve the problem of the delivery variable for MakeMaker which is different depending on version (PREFIX or destdir)

Location:

0.8.11

Files:

• pb/contrib/updateqemu (modified) (1 diff)
• pbconf/pbfilter/all.pbf (modified) (1 diff)
• pbconf/project-builder/pbfilter/redhat.pbf (added)
• pbconf/project-builder/pbfilter/rhel_3.pbf (added)
• pbconf/project-builder/pbfilter/rpm.pbf (modified) (1 diff)
• pbconf/project-builder/pbfilter/suse_10.0.pbf (added)
• pbconf/project-builder/rpm/project-builder.spec (modified) (3 diffs)

0.8.11/pb/contrib/updateqemu

@@ -25 +25 @@
     echo "Halting $m"
     echo "/sbin/halt -p" > /tmp/pbscript
-    pb -m $m -a root -s /tmp/pbscript script2vm 
+    #pb -m $m -a root -s /tmp/pbscript script2vm 
     sleep 120
     job=`ps auhxww | grep qemu | grep $m | grep -Ev 'grep|updateqemu' | awk '{print $2}'`
     if [ _"$job" != _"" ]; then
         echo "Really halting $m"
-        kill $job
+        #kill $job
     fi
 done

0.8.11/pbconf/pbfilter/all.pbf

@@ -27 +27 @@
 # PBPACKAGER is replaced by the packager name ($pbpackager in code)
 filter PBPACKAGER = $pbpackager
+

0.8.11/pbconf/project-builder/pbfilter/rpm.pbf

@@ -12 +12 @@
 # PBSUF is replaced by the package name ($pbpkg in code)
 filter PBSUF = $pbsuf
+
+# Special for pb : MakeMaker has various variable for the dest dir
+filter PBKEYWORD = destdir

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

@@ -2 +2 @@
 # $Id$
 #
-%define perlvendorlib: %(eval "`%{__perl} -V:installvendorlib | cut -d= -f2`")
+%define perlvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
 
 Summary:    Project Builder aka pb is a tool to produce packages for multiple distributions
@@ -35 +35 @@
 
 %build
-%{__perl} Makefile.PL destdir=$RPM_BUILD_ROOT
+%{__perl} Makefile.PL PBKEYWORD=$RPM_BUILD_ROOT
 make
 
@@ -50 +50 @@
 %doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu
 
-%{_prefix}/lib/perl5/vendor_perl/*/*
+%{perlvendorlib}/*
 %{_bindir}/*
 #%{_mandir}/*/*