Changeset 149

Timestamp:

01/05/09 11:43:06 (16 years ago)

Author:

kdeugau

Message:

/trunk

Allow uncompressed tarballs, and .tgz tarballs
Handle %{SOURCE0} properly (well, er, better...)

File:

• trunk/debbuild (modified) (2 diffs)

trunk/debbuild

@@ -867 +867 @@
       } elsif (/^source0?:\s*(.+)/i) {
         $pkgdata{main}{source} = $1;
-        die "Unknown tarball format $1\n" if $1 !~ /\.tar\.(?:gz|bz2)$/;
+        # .tar, .tar.gz, .tar.bz2, .tgz
+        die "Unknown tarball format $1\n" if $1 !~ /\.(?:tar(?:\.(?:gz|bz2))?|tgz)$/;
       } elsif (/^source([0-9]+):\s*(.+)/i) {
         $pkgdata{sources}{$1} = $2;
@@ -1594 +1595 @@
   if ($section =~ /p/) {
     $macrostring =~ s/\%\{buildroot\}/$specglobals{buildroot}/gi;
+    $macrostring =~ s/\%\{source0?}/$topdir\/SOURCES\/$pkgdata{main}{source}/gi;
     foreach my $source (keys %{$pkgdata{sources}}) {
       $macrostring =~ s/\%\{source$source\}/$topdir\/SOURCES\/$pkgdata{sources}{$source}/gi;