@origs=glob $glob;
confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
}
- my($base,$ext)=($origs[0]=~/^orig-(.*)[.]tar[.](gz|Z|bz2)$/);
+ my($origbase,$ext)=($origs[0]=~/^orig-(.*)[.]tar[.](gz|Z|bz2)$/);
_copy $origs[0],_rpmeval("_sourcedir")."/".($origs[0]=~/^orig-(.*)$/)[0];
_system "tar x".($ext eq "bz2" ? "j" : "z")."f ".$origs[0];
- _mkdir $base."-orig";
+ _mkdir $origbase."-orig";
# FIXME: Copy also dot-prefixed files!
- _move \1,$base."/*",$base."-orig/";
- _system "tar xzf $name-*.tar.gz";
+ _move \1,$origbase."/*",$origbase."-orig/";
+ rmdir $origbase or confess "rmdir $origbase: $!";
+ my @ours;
+ for my $glob ("$name-*.tar.gz") {
+ @ours=glob $glob;
+ confess "Invalid glob $glob: ".join(",",@ours) if 1!=@ours;
+ }
+ my($ourbase)=($ours[0]=~/^(.*)[.]tar[.]gz$/);
+ _system "tar xzf ".$ours[0];
# Use single-argument system() as we need shell redirection.
# FIXME: Use directory-independent _cleanfiles(), not root-directory '.cvsignore'.
# "-X -" does not work, it needs to be stat(2)able file.
_system "diff -ruP -X .cvsignore -I '".'[$]\(Id\|RCSfile\)\>.*[$]'."'"
- ." $base-orig/ $base/"
+ ." $origbase-orig/ $ourbase/"
." >"._rpmeval("_sourcedir")."/".$patch,
sub { $_[0]==0 || $_[0]==1; }; # diff(1) returns non-zero return code on any diffs.
- _remove \1,$base,$base."-orig";
+ _remove \1,$ourbase,$origbase."-orig";
}
_system(join(" ","rpmbuild",
"-ba",
./debian/tmp ./debian/<name>
./<name>*_[0-9]*
./macros/macros.dep
+ ./macros/glade-w.sh
./po/Makefile.in.in ./po/POTFILES* ./po/cat-id-tbl.c ./po/cat-id-tbl.tmp
./po/*.gmo ./po/*.mo ./po/stamp-cat-id ./po/<name>.pot ./po/ChangeLog
./po/Makevars ./po/Makevars.template ./po/Rules-quot ./po/*.sed ./po/*.sin ./po/*.header
cat $tmp/out
rm -f $tmp/out
CONFIGURE_SUBST_X_EOF
+ _remove "nocheck","./configure.orig"; # It is usually produced by 'CONFIGURE_SUBST_X'.
# Why it is left there after RedHat autoconf-2.53-8 ?
_remove "nocheck",\1,"autom4te-*.cache";