diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-05-13 04:02:03 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-05-13 04:02:03 +0000 |
| commit | 0862038e7f55a37a7438f00e90f8d8fd0f258fcc (patch) | |
| tree | 104984592e4f3f973ffd279945335e109a74dade | |
| parent | 27373de173d9a2fd932d689f9a9f9a57f31b6a77 (diff) | |
| download | rpm-setup-0862038e7f55a37a7438f00e90f8d8fd0f258fcc.tar rpm-setup-0862038e7f55a37a7438f00e90f8d8fd0f258fcc.tar.gz rpm-setup-0862038e7f55a37a7438f00e90f8d8fd0f258fcc.tar.bz2 rpm-setup-0862038e7f55a37a7438f00e90f8d8fd0f258fcc.tar.xz rpm-setup-0862038e7f55a37a7438f00e90f8d8fd0f258fcc.zip | |
fix rpm-increase-release-with-macros when mkrel is used
| -rw-r--r-- | rpm-spec-mode.el | 9 |
1 files 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")))))))) ;;------------------------------------------------------------ |