Changeset 179

Timestamp:

01/31/14 17:07:33 (11 years ago)

Author:

kdeugau

Message:

/trunk

Handle an edge case where no %setup tag is used
Expand macros in a couple of new places to match rpmbuild

File:

• trunk/debbuild (modified) (7 diffs)

trunk/debbuild

@@ -683 +683 @@
     if (/^\%build/) {
       $stage = 'build';
-      $buildscript .= "cd $tarballdir\n";
+      $buildscript .= "cd $tarballdir\n" if $pkgdata{main}{hassetup};
       next LINE;
     } # %build
@@ -689 +689 @@
     if (/^\%install/) {
       $stage = 'install';
-      $installscript .= "cd $tarballdir\n";
+      $installscript .= "cd $tarballdir\n" if $pkgdata{main}{hassetup};
       next LINE;
     } # %install
@@ -695 +695 @@
     if (/^\%clean/) {
       $stage = 'clean';
-      $cleanscript .= "cd $tarballdir\n";
+      $cleanscript .= "cd $tarballdir\n" if $pkgdata{main}{hassetup};
       next LINE;
     } # %clean
@@ -759 +759 @@
       # include %patch tags, may be just a bare shell script.
       if (/^\%setup/) {
+        $pkgdata{main}{hassetup} = 1;  # flag the fact that we've got %setup
         # Parse out the %setup macro.  Note that we aren't supporting
         # many of RPM's %setup features.
@@ -1291 +1292 @@
     close DEBSCRIPT;
 
+    $pkgdata{$pkg}{summary} = expandmacros($pkgdata{$pkg}{summary}, 'gp');
     my $control = "Package: $pkgdata{$pkg}{name}\n".
         "Version: ".(defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
@@ -1306 +1308 @@
         ( defined($pkgdata{$pkg}{replaces}) ? "Replaces: $pkgdata{$pkg}{replaces}\n" : '' ).
         "Description: $pkgdata{$pkg}{summary}\n";
+    $pkgdata{$pkg}{desc} = expandmacros($pkgdata{$pkg}{desc}, 'gp');
     # Munge things so that Debian tools don't choke on errant blank lines
     $pkgdata{$pkg}{desc} =~ s/\s+$//g;          # Trim trailing blanks
@@ -1466 +1469 @@
 sub checkbuildreq {
   return 1 if $buildreq eq '';  # No use doing extra work.
+
+  # expand macros 
+  $buildreq = expandmacros($buildreq,'gp');
 
   if ( ! -e "/usr/bin/dpkg-query" ) {