Support proper 'foreign'/patched packages versioning even for .deb pkgs.

[macros.git] / AutoGen.pm

diff --git a/AutoGen.pm b/AutoGen.pm
index fcd9374..36fd165 100644 (file)
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -231,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",
@@ -273,11 +280,14 @@ my($class,%args)=@_;
        _system "make distdir";
        # Copy 'orig' archive after &_prepdist which would delete it.
        my @origs;
+       my $base;
        for my $glob ("orig-$name-*.tar.{gz,Z,bz2}") {
                @origs=glob $glob;
                if (@origs) {
                        confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
-                       (my $deborig=$origs[0])=~s/^orig-([^-]+)-(.*)([.]tar[.][^.]+)$/$1_$2.orig$3/;
+                       $origs[0]=~/^orig-([^-]+)-(.*)([.]tar[.][^.]+)$/;
+                       my $deborig="$1_$2.orig$3";
+                       $base="$1-$2";
                        _copy $origs[0],$deborig;
                        }
                }
@@ -286,11 +296,12 @@ my($class,%args)=@_;
                @subdirs=glob $glob;
                confess "Invalid glob $glob: ".join(",",@subdirs) if 1!=@subdirs;
                }
-       _system(join(" ","cd ".$subdirs[0].";dpkg-buildpackage",
+       rename $subdirs[0],$base or confess "$!";
+       _system(join(" ","cd ".$base.";dpkg-buildpackage",
                        "-rfakeroot",
                        ($args{"sign"} ? () : ("-us","-uc")),
                        ));
-       _remove \1,$subdirs[0];
+       _remove \1,$base;
        _system "ls -l ${name}*_[0-9]*";
        exit 0; # should never return
 }