Changeset 15 for trunk

Timestamp:

11/08/05 17:16:30 (19 years ago)

Author:

kdeugau

Message:

/trunk

Checkpoint
Added more-or-less support for %{sourcenn} macro expansion

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -412 +412 @@
         $pkgdata{main}{source} = $1;
         die "Unknown tarball format $1\n" if $1 !~ /\.tar\.(?:gz|bz2)$/;
+      } elsif (/^source([0-9]+):\s+(.+)/i) {
+        $pkgdata{sources}{$1} = $2;
       } elsif (/^patch([^:]+):\s+(.+)$/i) {
         $pkgdata{main}{"patch$1"} = $2;
@@ -653 +655 @@
   # Package data
   if ($section =~ /p/) {
-    $macrostring =~ s/\%\{buildroot\}/$buildroot/g;
-
-    $macrostring =~ s/\%\{name\}/$pkgdata{main}{name}/g;
-    $macrostring =~ s/\%\{version\}/$pkgdata{main}{version}/g;
-    $macrostring =~ s/\%\{release\}/$pkgdata{main}{release}/g;
+    $macrostring =~ s/\%\{buildroot\}/$buildroot/gi;
+    foreach my $source (keys %{$pkgdata{sources}}) {
+      $macrostring =~ s/\%\{source$source\}/$topdir\/SOURCES\/$pkgdata{sources}{$source}/gi;
+    }
+    $macrostring =~ s/\%\{name\}/$pkgdata{main}{name}/gi;
+    $macrostring =~ s/\%\{version\}/$pkgdata{main}{version}/gi;
+    $macrostring =~ s/\%\{release\}/$pkgdata{main}{release}/gi;
   }