Fixed/updated RPM build to get it working for the first time.

[macros.git] / AutoGen.pm

diff --git a/AutoGen.pm b/AutoGen.pm
index 4f2fd1f..5c3c10f 100644 (file)
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -160,19 +160,21 @@ my($class,%args)=@_;
                        "ARGV"=>["--copy"],
                        "configure_args"=>[split /\s+/,($spec=~/^%configure\s+(.*)$/m)[0]],
                        );
+       _remove "ChangeLog";    # force its rebuild by Makefile/rcs2log
        _system "make dist $name.spec";
        _copy "$name-*.tar.gz",_rpmeval("_sourcedir");
-       _system(join(" ","rpm",
+       _system(join(" ","rpmbuild",
                        "-ba",
+                       "--rmsource",   # _remove _rpmeval("_sourcedir")."/$name-*.tar.gz";
+                       "--clean",      # _remove _rpmeval("_builddir")."/$name-VERSION";
                        (!$args{"sign"} ? () : "--sign"),
                        "$name.spec",
                        ));
        _system "make dist-tarZ" if $Options{"dist-tarZ"};
-       _remove _rpmeval{"_sourcedir"}."/$name-*.tar.gz";
-       _move _rpmeval{"_srcrpmdir"}."/$name-*.src.rpm",".";
-       _move "nocheck",_rpmeval{"_rpmdir"}."/"._rpmeval{"_arch"}."/$name-*."._rpmeval{"_arch"}.".rpm",".";
+       _move _rpmeval("_srcrpmdir")."/$name-*.src.rpm",".";
+       _move _rpmeval("_rpmdir")."/"._rpmeval("_arch")."/$name-*."._rpmeval("_arch").".rpm",".";
   _system "ls -l $name-*";
-       # NOTREACHED
+       exit 0; # should never return
 }
 
 # WARNING: doesn't respect %Options change!
@@ -212,6 +214,7 @@ sub _cleanfiles
                                                ./confdefs.h ./conftest* ./autoh[0-9]* ./confcache
                                                ./config.rpath
                                                ./depcomp
+                                               ./compile
                                                ./stamp-h ./stamp-h.in ./stamp-h1
                                                ./install-sh
                                                ./aclocal.m4
@@ -344,8 +347,8 @@ my($class,%options)=@_;
        Getopt::Long::Configure('noignorecase','prefix_pattern=(--|-|\+|)');
        local @ARGV=@{$Options{"ARGV"}};
        print _help() and confess if !GetOptions(
-                         "rpm"      ,sub { $class->_rpmbuild("sign"=>1); return; },
-                         "rpmtest"  ,sub { $class->_rpmbuild("sign"=>0); return; },
+                         "rpm"      ,sub { $class->_rpmbuild("sign"=>1); },
+                         "rpmtest"  ,sub { $class->_rpmbuild("sign"=>0); },
                          "dist"     ,\$Options{"ARGV_dist"},
                          "copy!"    ,\$Options{"ARGV_copy"},
                          "fullclean",\$Options{"ARGV_fullclean"},
@@ -411,6 +414,7 @@ my($class,%options)=@_;
                                                                                                        .q< -e '1,/^@@.*@@$$/d'>
                                                                                                        .q< -e '/^[+-]"POT-Creation-Date:/d'>
                                                                                                        .q< -e '/^[^+-]/d'>
+                                                                                                       .q< -e '/^[+-]#/d'>
                                                                                        .q< | wc -l` -eq 0;then>
                                                                        .q< touch --reference=$${lang}.po $${lang}.po~;>
                                                                                        .q< mv -f $${lang}.po~ $${lang}.po;>