git://git.jankratochvil.net
/
macros.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5d2cd3
)
Fixed/updated RPM build to get it working for the first time.
author
short
<>
Wed, 5 Feb 2003 12:29:57 +0000
(12:29 +0000)
committer
short
<>
Wed, 5 Feb 2003 12:29:57 +0000
(12:29 +0000)
AutoGen.pm
patch
|
blob
|
history
diff --git
a/AutoGen.pm
b/AutoGen.pm
index
f0feb2d
..
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]],
);
"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 "make dist $name.spec";
_copy "$name-*.tar.gz",_rpmeval("_sourcedir");
- _system(join(" ","rpm",
+ _system(join(" ","rpm
build
",
"-ba",
"-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"};
(!$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-*";
_system "ls -l $name-*";
- # NOTREACHED
+ exit 0; # should never return
}
# WARNING: doesn't respect %Options change!
}
# WARNING: doesn't respect %Options change!
@@
-345,8
+347,8
@@
my($class,%options)=@_;
Getopt::Long::Configure('noignorecase','prefix_pattern=(--|-|\+|)');
local @ARGV=@{$Options{"ARGV"}};
print _help() and confess if !GetOptions(
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"},
"dist" ,\$Options{"ARGV_dist"},
"copy!" ,\$Options{"ARGV_copy"},
"fullclean",\$Options{"ARGV_fullclean"},