Changeset 199

Timestamp:

08/03/15 17:31:13 (9 years ago)

Author:

kdeugau

Message:

/trunk

Fix and slightly extend SourceNN: archive format support again for rare
.tgz and .tar.Z.

Andreas Scherer suggested adding support for .zip, and provided a
preliminary patch (thanks!); comments on the patch noted .tgz was
probably broken (yep) and while I was looking at the set I noticed I had
made partial allowance for .tar.Z but had left that incomplete as well.

File:

• trunk/debbuild (modified) (6 diffs)

trunk/debbuild

@@ -368 +368 @@
   $specfile = "$topdir/BUILD/". qx { zcat $tarball |tar -t |grep -e '[\.]spec\$' };
   chomp $specfile;
-  my ($fileonly, $dirname) = ($tarball =~ /(([a-zA-Z0-9._-]+)\.tar\.(?:gz|bz2|xz))$/);
+  my ($fileonly, $dirname) = ($tarball =~ /(([a-zA-Z0-9._-]+)\.(?:tgz|tar\.(?:gz|bz2|xz|Z)))$/);
 
   $tarball = abs_path($tarball);
 ##fixme:  use macro expansions for the executables
   my $unpackcmd = "cd $topdir/BUILD; ".
-        ( $tarball =~ /\.tar\.gz$/       ? "/bin/gzip"   : "" ).
-        ( $tarball =~ /\.tar\.bz2$/      ? "/bin/bzip2"  : "" ).
-        ( $tarball =~ /\.tar\.(?:gz|Z)$/ ? "/usr/bin/xz" : "" ).
+        ( $tarball =~ /\.(?:tgz|tar\.(?:gz|Z))$/         ? "/bin/gzip"   : "" ).
+        ( $tarball =~ /\.tar\.bz2$/                      ? "/bin/bzip2"  : "" ).
+        ( $tarball =~ /\.tar\.xz$/                       ? "/usr/bin/xz" : "" ).
         " -dc $tarball |/bin/tar -xf -";
 
@@ -933 +933 @@
           } else {
             $prepscript .=
-                ( $pkgdata{main}{source} =~ /\.tar\.gz$/  ? "/bin/gzip"   : "" ).
-                ( $pkgdata{main}{source} =~ /\.tar\.bz2$/ ? "/bin/bzip2"  : "" ).
-                ( $pkgdata{main}{source} =~ /\.tar\.xz$/  ? "/usr/bin/xz" : "" ).
+                ( $pkgdata{main}{source} =~ /\.(?:tgz|tar\.(?:gz|Z))$/   ? "/bin/gzip"   : "" ).
+                ( $pkgdata{main}{source} =~ /\.tar\.bz2$/                ? "/bin/bzip2"  : "" ).
+                ( $pkgdata{main}{source} =~ /\.tar\.xz$/                 ? "/usr/bin/xz" : "" ).
                 " -dc '$topdir/SOURCES/$pkgdata{main}{source}' | /bin/tar -x".
                 ( $quietunpack ? '' : 'vv' )."f - ";
@@ -952 +952 @@
             } else {
               $prepscript .=
-                ( $pkgdata{sources}{$snum} =~ /\.tar\.gz$/  ? "/bin/gzip"   : "" ).
-                ( $pkgdata{sources}{$snum} =~ /\.tar\.bz2$/ ? "/bin/bzip2"  : "" ).
-                ( $pkgdata{sources}{$snum} =~ /\.tar\.xz$/  ? "/usr/bin/xz" : "" ).
+                ( $pkgdata{sources}{$snum} =~ /\.(?:tgz|tar\.(?:gz|Z))$/ ? "/bin/gzip"   : "" ).
+                ( $pkgdata{sources}{$snum} =~ /\.tar\.bz2$/              ? "/bin/bzip2"  : "" ).
+                ( $pkgdata{sources}{$snum} =~ /\.tar\.xz$/               ? "/usr/bin/xz" : "" ).
                 " -dc '$topdir/SOURCES/$pkgdata{sources}{$snum}' | /bin/tar -x".
                 ( $quietunpack ? '' : 'vv' )."f -";
@@ -969 +969 @@
             } else {
               $prepscript .=
-                ( $pkgdata{sources}{$snum} =~ /\.tar\.gz$/  ? "/bin/gzip"   : "" ).
-                ( $pkgdata{sources}{$snum} =~ /\.tar\.bz2$/ ? "/bin/bzip2"  : "" ).
-                ( $pkgdata{sources}{$snum} =~ /\.tar\.xz$/  ? "/usr/bin/xz" : "" ).
+                ( $pkgdata{sources}{$snum} =~ /\.(?:tgz|tar\.(?:gz|Z))$/  ? "/bin/gzip"   : "" ).
+                ( $pkgdata{sources}{$snum} =~ /\.tar\.bz2$/               ? "/bin/bzip2"  : "" ).
+                ( $pkgdata{sources}{$snum} =~ /\.tar\.xz$/                ? "/usr/bin/xz" : "" ).
                 " -dc '$topdir/SOURCES/$pkgdata{sources}{$snum}' | /bin/tar -x".
                 ( $quietunpack ? '' : 'vv' )."f -";
@@ -1171 +1171 @@
         $pkgdata{main}{source} =~ s|^.+/([^/]+)$|$1|;
         $pkgdata{sources}{0} = $pkgdata{main}{source};
-        # .tar, .tar.gz, .tar.bz2, .tgz, .xz, .zip
-        die "Unknown Source: header format $sval\n" if $sval !~ /\.(?:tar(?:\.(?:gz|bz2|xz))?|tgz|zip)$/;
+        # .tar, .tar.gz, .tar.Z, .tar.bz2, .tar.xz, .tgz, .zip
+        die "Unknown Source: header format $sval\n" if $sval !~ /\.(?:tar(?:\.(?:gz|bz2|xz|Z))?|tgz|zip)$/;
       } elsif (my ($srcnum, $src) = (/^source([0-9]+):\s*(.+)/i)) {
         $src =~ s/\s*$//;
@@ -2097 +2097 @@
  debbuild {-ba|-bb|-bp|-bc|-bi|-bl|-bs} [build-options] file.spec
 
- debbuild {-ta|-tb|-tp|-tc|-ti|-tl|-ts} [build-options] file.tar.{gz|bz2|xz}
+ debbuild {-ta|-tb|-tp|-tc|-ti|-tl|-ts} [build-options] file.{tgz|zip|tar.{gz|bz2|xz|Z}}
 
  debbuild --rebuild file.{src.rpm|sdeb}