aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mandriva.com>2005-04-01 20:27:07 +0000
committerMichael Scherer <misc@mandriva.com>2005-04-01 20:27:07 +0000
commit8ea8515d4202ed5925b93941a460c6d099d6396d (patch)
tree053ca55fd88d1cefa54380a925139922bae9c47d
parentddd2f3741724cb7adee34787faa234672c6b0d7f (diff)
downloadbootsplash-8ea8515d4202ed5925b93941a460c6d099d6396d.tar
bootsplash-8ea8515d4202ed5925b93941a460c6d099d6396d.tar.gz
bootsplash-8ea8515d4202ed5925b93941a460c6d099d6396d.tar.bz2
bootsplash-8ea8515d4202ed5925b93941a460c6d099d6396d.tar.xz
bootsplash-8ea8515d4202ed5925b93941a460c6d099d6396d.zip
- fix %mkrel still being incremented when a new version is build.
-rwxr-xr-xrpmbuildupdate4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpmbuildupdate b/rpmbuildupdate
index f90dfd4..46afde7 100755
--- a/rpmbuildupdate
+++ b/rpmbuildupdate
@@ -242,14 +242,14 @@ sub build {
# case of %define release %mkrel 2
if ( /^(.*\s\%mkrel\s+)(\d+)(.*)$/ )
{
- $_ = "$1" . ( $2 + 1 ) . "$3\n";
+ $_ = "$1" . ((( $version eq $newversion ) ? $2 : 0 ) + 1 ) . "$3\n";
}
# case of %define release %mkrel %rel
# and %define rel 2
if ( /^(\%define\s+rel\s+)(\d+)(.*)$/ )
{
- $_ = "$1" . ( $2 + 1 ) . "$3\n";
+ $_ = "$1" . ((( $version eq $newversion ) ? $2 : 0 ) + 1 ) . "$3\n";
}