aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrpmbuildupdate8
1 files changed, 4 insertions, 4 deletions
diff --git a/rpmbuildupdate b/rpmbuildupdate
index bdca764..211be89 100755
--- a/rpmbuildupdate
+++ b/rpmbuildupdate
@@ -104,7 +104,7 @@ sub fetch_http
( $basename = $url ) =~ s!.*/!!;
my $turl;
- system("rm -f $basename");
+ system("rm -f $basename") if ($config{nobuild});
download($url);
foreach ('.tar.gz' , '.tgz' , '.zip' )
@@ -207,7 +207,7 @@ sub build
{
my $email;
my @l = getpwuid($<);
- $email = $ENV{EMAIL} || $l[6]." <$l[0]\@mandrakesoft.com>";
+ $email = $ENV{EMAIL} ? $l[6]." <$ENV{EMAIL}>" : $l[6]." <$l[0]\@mandrakesoft.com>";
$spec .= "* ".`LC_TIME=C date '+%a %b %e %Y'|tr -d '\n'`." ".$email.
" ".$newversion."-".$config{release}."\n";
$spec .= "- New release $newversion\n\n";
@@ -235,7 +235,7 @@ sub build
my $basename;
($basename=$_)=~ s!.*/!!;
- system("rm -f ${top}/SOURCES/$basename");
+ system("rm -f ${top}/SOURCES/$basename") if ($config{nobuild});
# GNOME: add the major version to the URL automatically
# for example: ftp://ftp://ftp.gnome.org/pub/GNOME/sources/ORbit2/ORbit2-2.10.0.tar.bz2
@@ -315,7 +315,7 @@ sub build
{
wait;
print "Binary build fails: building source only\n";
- system("$rpm -bs ../SPECS/".$pkg.".spec");
+ system("$rpm -bs --nodeps ../SPECS/".$pkg.".spec");
}
wait;
}