From: short <>
Date: Sat, 30 Aug 2003 10:28:04 +0000 (+0000)
Subject: &_rpmbuild: Support also .tar.bz2 orig source packages.
X-Git-Tag: lufs_0_9_6_captive1~12
X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=commitdiff_plain;h=19e00dcd0398730dff10b24fe7258f7b5b79f4ec

&_rpmbuild: Support also .tar.bz2 orig source packages.
---

diff --git a/AutoGen.pm b/AutoGen.pm
index de75b41..8519a75 100644
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -214,20 +214,20 @@ my($class,%args)=@_;
 	$class->_prepdist($name);
 	_system "make $name.spec";
 	my $spec=_readfile "$name.spec";
-	my $patch=($spec=~/^Patch\d*:\s*(.*)$/m)[0];
+	my $patch=($spec=~/^Patch\d*\s*:\s*(.*)$/m)[0];
 	_system "make dist";
 	if (!$patch) {
 		_copy "$name-*.tar.gz",_rpmeval("_sourcedir");
 		}
 	else {
 		my @origs;
-		for my $glob ("orig-$name-*.tar.{gz,Z}") {
+		for my $glob ("orig-$name-*.tar.{gz,Z,bz2}") {
 			@origs=glob $glob;
 			confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
 			}
-		my $base=($origs[0]=~/^orig-(.*)[.]tar[.](?:gz|Z)$/)[0];
+		my($base,$ext)=($origs[0]=~/^orig-(.*)[.]tar[.](gz|Z|bz2)$/);
 		_copy $origs[0],_rpmeval("_sourcedir")."/".($origs[0]=~/^orig-(.*)$/)[0];
-		_system "tar xzf ".$origs[0];
+		_system "tar x".($ext eq "bz2" ? "j" : "z")."f ".$origs[0];
 		_mkdir $base."-orig";
 		# FIXME: Copy also dot-prefixed files!
 		_move \1,$base."/*",$base."-orig/";