Support proper 'foreign'/patched packages versioning.

[macros.git] / AutoGen.pm

diff --git a/AutoGen.pm b/AutoGen.pm
index 8519a75..17c1483 100644 (file)
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -43,6 +43,9 @@ HERE
                }
        die "You are missing some modules - install them by:\n"
                                        ."\tperl -MCPAN -e 'install qw(".join(" ",@missing).")'\n"
+                                       ."If you see messages: Writing Makefile for <packagename> -- NOT OK\n"
+                                       ."you may did not have installed make(1) while configuring Perl CPAN.\n"
+                                       ."Install make(1) and type 'o conf init' in: perl -MCPAN -e shell\n"
                        if @missing;
        }
 
@@ -56,6 +59,9 @@ Beware: '.basename($0).' is a tool only for maintainers!
 Supported parameters:
  --rpm       Build RPM packages locally (needs /usr/src/(redhat|packages)/ access)
  --rpmtest   Build RPM like "rpm" but w/o gpg/pgp signing
+ --deb       Build DEB packages locally
+ --debtest   Build DEB like "deb" but w/o gpg/pgp signing
+ --dist      Prepare all build files but do not run the final "./configure"
  --clean     Standard cleanup method
  --fullclean Like clean but even the .cvsignore files are removed
  --copy      Behave exactly like in default mode but copy all instead of symlinks
@@ -225,21 +231,28 @@ my($class,%args)=@_;
                        @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",
@@ -267,7 +280,7 @@ my($class,%args)=@_;
        _system "make distdir";
        # Copy 'orig' archive after &_prepdist which would delete it.
        my @origs;
-       for my $glob ("orig-$name-*.tar.{gz,Z}") {
+       for my $glob ("orig-$name-*.tar.{gz,Z,bz2}") {
                @origs=glob $glob;
                if (@origs) {
                        confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
@@ -341,6 +354,7 @@ sub _cleanfiles
                                                ./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
@@ -585,6 +599,7 @@ my($class,%options)=@_;
      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";