Changeset 174

Timestamp:

10/16/12 16:53:33 (12 years ago)

Author:

kdeugau

Message:

/trunk

Teach debbuild about xz compression for %source and %patch

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• debbuild (modified) (5 diffs)

trunk/Makefile

@@ -6 +6 @@
 
 PKGNAME=debbuild
-VERSION=0.9.7
+VERSION=0.9.8
 
 MANDIR=/usr/share/man

trunk/debbuild

@@ -268 +268 @@
   $specfile = "$topdir/BUILD/". qx { zcat $tarball |tar -t |grep -e '[\.]spec\$' };
   chomp $specfile;
-  my ($fileonly, $dirname) = ($tarball =~ /(([a-zA-Z0-9._-]+)\.tar\.(?:gz|bz2))$/);
+  my ($fileonly, $dirname) = ($tarball =~ /(([a-zA-Z0-9._-]+)\.tar\.(?:gz|bz2|xz))$/);
 
   $tarball = abs_path($tarball);
-  my $unpackcmd = "cd $topdir/BUILD; tar -".
-        ( $tarball =~ /\.tar\.gz$/ ? "z" : "" ).
-        ( $tarball =~ /\.tar\.bz2$/ ? "j" : "" ). "xf $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" : "" ).
+        " -dc $tarball |/bin/tar -xf -";
+
   system "$unpackcmd";
   system "cp $tarball $topdir/SOURCES/$fileonly";
@@ -765 +769 @@
           $prepscript .= "mkdir $tarballdir\ncd $tarballdir\n";
         }
-        $prepscript .= "tar -".
-                ( $pkgdata{main}{source} =~ /\.tar\.gz$/ ? "z" : "" ).
-                ( $pkgdata{main}{source} =~ /\.tar\.bz2$/ ? "j" : "" ).
-                ( /\s+-q\s+/ ? '' : 'vv' )."xf ".
-                "$topdir/SOURCES/$pkgdata{main}{source}\n".
+        $prepscript .=
+                ( $pkgdata{main}{source} =~ /\.tar\.gz$/  ? "/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 -".
+                ( /\s+-q\s+/ ? '' : 'vv' )."xf -\n".
                 qq(STATUS=\$?\nif [ \$STATUS -ne 0 ]; then\n  exit \$STATUS\nfi\n).
                 "cd $topdir/BUILD/$tarballdir\n".
@@ -784 +789 @@
         # would ever have such things, but there they are...  and rpmbuild supports 'em
         # patch originally suggested by Lucian Cristian for .bz2
-        # reworked and expanded to support .Z/.gz as well
-        if ( $pkgdata{main}{"patch$patchnum"} =~ /\.(?:Z|gz|bz2)$/ ) {
+        # reworked and expanded to support .Z/.gz/.xz as well
+        if ( $pkgdata{main}{"patch$patchnum"} =~ /\.(?:Z|gz|bz2|xz)$/ ) {
           my $decompressor;
-          $decompressor = 'gzip' if $pkgdata{main}{"patch$patchnum"} =~ /\.(?:Z|gz)$/;
+          $decompressor = 'gzip'  if $pkgdata{main}{"patch$patchnum"} =~ /\.(?:Z|gz)$/;
           $decompressor = 'bzip2' if $pkgdata{main}{"patch$patchnum"} =~ /\.bz2$/;
+          $decompressor = 'xz'    if $pkgdata{main}{"patch$patchnum"} =~ /\.xz$/;
           $prepscript .= qq(/bin/$decompressor -d < $topdir/SOURCES/$pkgdata{main}{"patch$patchnum"} | patch );
           $prepscript .= $patchopts if $patchopts;
@@ -955 +961 @@
         # Do this here since we don't use any URL forms elsewhere (maybe some other time)
         $pkgdata{main}{source} =~ s|^.+/([^/]+)$|$1|;
-        # .tar, .tar.gz, .tar.bz2, .tgz
-        die "Unknown tarball format $1\n" if $1 !~ /\.(?:tar(?:\.(?:gz|bz2))?|tgz)$/;
+        # .tar, .tar.gz, .tar.bz2, .tgz, .xz
+        die "Unknown tarball format $1\n" if $1 !~ /\.(?:tar(?:\.(?:gz|bz2|xz))?|tgz)$/;
       } elsif (my ($srcnum, $src) = (/^source([0-9]+):\s*(.+)/i)) {
         $pkgdata{sources}{$srcnum} = $src;
@@ -1836 +1842 @@
  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}
+ debbuild {-ta|-tb|-tp|-tc|-ti|-tl|-ts} [build-options] file.tar.{gz|bz2|xz}
 
  debbuild --rebuild file.{src.rpm|sdeb}