From 8ea8515d4202ed5925b93941a460c6d099d6396d Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mandriva.com>
Date: Fri, 1 Apr 2005 20:27:07 +0000
Subject: - fix %mkrel still being incremented when a new version is build.

---
 rpmbuildupdate | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rpmbuildupdate')

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";
         }
         
         
-- 
cgit v1.2.1