- do not replace %{release} if it used in the Release: tag.

1 files changed, 6 insertions, 6 deletions

diff --git a/rpmbuildupdate b/rpmbuildupdate
index 8c2fe0f..8f6591a 100755
--- a/rpmbuildupdate
+++ b/rpmbuildupdate
@@ -167,13 +167,13 @@ sub build {
 		$newversion = $version; 
 		my @tmp = split(/\./,$newrelease);
 		$tmp[-1]++;
-		$release = join('.',@tmp) . $release_prefix;
+		$newrelease = join('.',@tmp) . $release_prefix;
         	$message = $config{message} || '- Rebuild';
 	} else {
         	$message = $config{message} || '- New release %%VERSION';
-		$release = "1$release_prefix";
+		$newrelease = "1$release_prefix";
 	}
-	$release = $config{release} if $config{release};
+	$newrelease = $config{release} if $config{release};
 	
 	if ($config{log})
 	{
@@ -212,10 +212,10 @@ sub build {
 		# Doing a s/// version
 		s/\%define\s+version\s+$version/\%define version $newversion/g;
 		s/Version:\s+$version/Version: $newversion/g;
+		s/Release\s*:\s*$release/Release: $newrelease/;
+		s/\%define(\s+)release(\s+)(.*)/\%define release $newrelease/;
 		
 		$spec .= $_;
-		$spec =~ s/\%define(\s+)release(\s+)(.*)/\%define release $release/;
-		$spec =~ s/Release\s*:(\s*)(\S*)/Release: $release/;
 		push(@url, $2) if /(Source[0-9]*)\s*:\s+((?:ftp|svns?|https?):\S+)/i;
 		$tar_ball=$2 if /(Source[0-9]*)\s*:\s+([^:\s]+)/i and ! $tar_ball;
 		
@@ -235,7 +235,7 @@ sub build {
 			# if macro is undefined
 			$packager =~ s/\%packager//g;
 			my $email = $packager ? $packager : $l[6] . ( $ENV{EMAIL} ? " <$ENV{EMAIL}>" : " <$l[0]\@mandrakesoft.com>");
-			$spec .= "* " . `LC_TIME=C date '+%a %b %e %Y'|tr -d '\n'` . " $email $newversion-$release\n";
+			$spec .= "* " . `LC_TIME=C date '+%a %b %e %Y'|tr -d '\n'` . " $email $newversion-$newrelease\n";
 			$spec .= "$message\n\n";
 		}
 	}