aboutsummaryrefslogtreecommitdiffstats
path: root/rpmbuildupdate
diff options
context:
space:
mode:
authorFrederic Lepied <flepied@mandriva.com>2004-04-05 20:50:40 +0000
committerFrederic Lepied <flepied@mandriva.com>2004-04-05 20:50:40 +0000
commit0575bfd24b48b64b23c75c5b58bf77faf5e60417 (patch)
treefd6adf5cd76be772d1ad3d0a55b41c0295391a3e /rpmbuildupdate
parent9b99f1cb8292fdffb398e4816a8406021c269618 (diff)
downloadbootsplash-0575bfd24b48b64b23c75c5b58bf77faf5e60417.tar
bootsplash-0575bfd24b48b64b23c75c5b58bf77faf5e60417.tar.gz
bootsplash-0575bfd24b48b64b23c75c5b58bf77faf5e60417.tar.bz2
bootsplash-0575bfd24b48b64b23c75c5b58bf77faf5e60417.tar.xz
bootsplash-0575bfd24b48b64b23c75c5b58bf77faf5e60417.zip
correctly handle .gz in redhat packageV0_17_1mdk
support Release tag not in a macro
Diffstat (limited to 'rpmbuildupdate')
-rwxr-xr-xrpmbuildupdate11
1 files changed, 6 insertions, 5 deletions
diff --git a/rpmbuildupdate b/rpmbuildupdate
index b969ddf..63f802b 100755
--- a/rpmbuildupdate
+++ b/rpmbuildupdate
@@ -75,7 +75,7 @@ sub build
my $found = 0;
my ($version, $release);
my ($spec, @url, @rpms, %specvars);
-
+
my $top = $config{top} || `rpm --eval '%_topdir'`;
chomp($top);
chdir("$top/SOURCES") or die "Unable to chdir to $top/SOURCES";
@@ -143,6 +143,7 @@ sub build
$spec .= $_;
$spec =~ s/\%define(\s+)release(\s+)(.*)/\%define release $config{release}/;
+ $spec =~ s/Release:(\s+)(.*mdk)/Release:\1$config{release}/;
push(@url, $2) if(/(Source[0-9]*):\s+((?:ftp|http):\S+)/i);
# For %vars !
@@ -154,7 +155,7 @@ sub build
{
my $email;
my @l = getpwuid($<);
- $email = $ENV{EMAIL} || $l[6]." <$l[0]\@mandrakesoft.com> ";
+ $email = $ENV{EMAIL} || $l[6]." <$l[0]\@mandrakesoft.com>";
$spec .= "* ".qx[LC_TIME=C date '+%a %b %d %Y'|tr -d '\n']." ".$email.
" ".$newversion."-".$config{release}."\n";
$spec .= "- New release $newversion\n\n";
@@ -202,9 +203,9 @@ sub build
if (! -f "${top}/SOURCES/$basename")
{
- $basename =~ s/bz2/gz/;
- print "Trying from fedora($basename): $config{fedora}/$pkgrpmrh\n";
- system("cd ${top}/SOURCES; rpm2cpio $config{fedora}/$pkgrpmrh | cpio -id $basename; bzme $basename");
+ (my $bname = $basename) =~ s/bz2/gz/;
+ print "Trying from fedora($bname): $config{fedora}/$pkgrpmrh\n";
+ system("cd ${top}/SOURCES; rpm2cpio $config{fedora}/$pkgrpmrh | cpio -id $bname; bzme $bname");
wait;
}
}