$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/";
return if $Options{"ARGV_clean"} || $Options{"ARGV_fullclean"};
$Options{"aclocal_args"}=[qw(-I macros),map((!$_ ? () : @$_),$Options{"aclocal_args"})];
- my $configure_in=_readfile("configure.in");
- do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GNU_GETTEXT\b/m; }
+ my $configure_name;
+ do { $configure_name||=$_ if -f $_ } for ("configure.in");
+ do { $configure_name||=$_ if -f $_ } for ("configure.ac");
+ $configure_name or confess "Cannot find configure.{in,ac}";
+ my $configure_in=_readfile($configure_name);
+ do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_GNU_GETTEXT\b/m; }
for (\$Options{"want-gettextize"});
- do { $$_=1 if !defined($$_) && $configure_in=~/^AM_GLIB_GNU_GETTEXT\b/m; }
+ do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_GLIB_GNU_GETTEXT\b/m; }
for (\$Options{"want-glib-gettextize"});
- do { $$_=1 if !defined($$_) && $configure_in=~/^AM_PROG_LIBTOOL\b/m; }
+ do { $$_=1 if !defined($$_) && $configure_in=~/^\s*AM_PROG_LIBTOOL\b/m; }
for (\$Options{"want-libtoolize"});
- do { $$_=1 if !defined($$_) && $configure_in=~/^A[CM]_CONFIG_HEADER\b/m; }
+ do { $$_=1 if !defined($$_) && $configure_in=~/^\s*A[CM]_CONFIG_HEADER\b/m; }
for (\$Options{"want-autoheader"});
my @copy_arg=(!$Options{"ARGV_copy"} ? () : "--copy");
."'") {
_system $_ and confess $_;
}
- for ("configure.in","Makefile.am") {
+ for ($configure_name,"Makefile.am") {
STDERR->printflush("gettextize recovery rename \"$_~\"->\"$_\"... ");
rename "$_~","$_" or confess "$!";
STDERR->printflush("ok\n");