From 0862038e7f55a37a7438f00e90f8d8fd0f258fcc Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 13 May 2005 04:02:03 +0000
Subject: fix rpm-increase-release-with-macros when mkrel is used

---
 rpm-spec-mode.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index 82af626..f3569af 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -1304,10 +1304,11 @@ if one is present in the file."
 			 t)))))
 
       (if (string-match "%{?\\([^}]*\\)}?$" str)
-	  (or (funcall increase-macro (substring str (match-beginning 1) (match-end 1)))
-	      (and (search-forward-regexp
-		    (concat "%define[ \t]+" macros "[ \t]+%mkrel[ \t]+%{rel}") nil t)
-		   (funcall increase-macro "rel")))))))
+	  (let ((macros (substring str (match-beginning 1) (match-end 1))))
+	    (or (funcall increase-macro macros)
+		(and (search-forward-regexp
+		      (concat "%define[ \t]+" macros "[ \t]+%mkrel[ \t]+%{rel}") nil t)
+		     (funcall increase-macro "rel"))))))))
 
 ;;------------------------------------------------------------
 
-- 
cgit v1.2.1