CVS update by scop packages/xemacs-packages/prog-modes, rpm-spec-mode.el ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 08/02/09 23:40:05

  Modified:    packages/xemacs-packages/prog-modes ChangeLog
                        rpm-spec-mode.el
Log:
Improve rpm-increase-release-tag <200802100039.31033.scop at xemacs.org>

Revision  Changes    Path
1.256     +7 -0      XEmacs/packages/xemacs-packages/prog-modes/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/prog-modes/ChangeLog,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- ChangeLog	2007/11/05 10:10:51	1.255
+++ ChangeLog	2008/02/09 22:40:04	1.256
@@ -1,3 +1,10 @@
+2008-02-10  Ville Skyttä  <scop at xemacs.org>
+
+	* rpm-spec-mode.el (rpm-increase-release-tag): Increase last digit
+	of the release tag instead of the first (eg. Y of X.Y, not X), with
+	some heuristics in deciding what the desired "last" digit is.
+	(rpm-spec-mode-version): Set to 0.12.1x.
+
 2007-11-05  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 2.15 released.



1.26      +8 -5      XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el

Index: rpm-spec-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- rpm-spec-mode.el	2007/11/01 20:02:33	1.25
+++ rpm-spec-mode.el	2008/02/09 22:40:05	1.26
@@ -63,7 +63,7 @@
 
 ;;; Code:
 
-(defconst rpm-spec-mode-version "0.12x" "Version of `rpm-spec-mode'.")
+(defconst rpm-spec-mode-version "0.12.1x" "Version of `rpm-spec-mode'.")
 
 (defgroup rpm-spec nil
   "RPM spec mode with Emacs/XEmacs enhancements."
@@ -1233,14 +1233,17 @@ command."
   (save-excursion
     (goto-char (point-min))
     (if (search-forward-regexp
-         "^\\(Release[ \t]*:[ \t]*\\)\\([0-9]+\\)\\(.*\\)" nil t)
-        (let ((release (1+ (string-to-int (match-string 2)))))
-          (setq release (concat (int-to-string release) (match-string 3)))
+         ;; Try to find the last digit-only group of a dot-separated release string
+         (concat "^\\(Release[ \t]*:[ \t]*\\)"
+                 "\\(.*[ \t\\.}]\\)\\([0-9]+\\)\\([ \t\\.%].*\\|$\\)") nil t)
+        (let ((release (1+ (string-to-int (match-string 3)))))
+          (setq release
+                (concat (match-string 2) (int-to-string release) (match-string 4)))
           (replace-match (concat (match-string 1) release))
           (message "Release tag changed to %s." release))
       (if (search-forward-regexp "^Release[ \t]*:[ \t]*%{?\\([^}]*\\)}?$" nil t)
           (rpm-increase-release-with-macros)
-        (message "No Release tag found...")))))
+        (message "No Release tag to increase found...")))))
 
 ;;------------------------------------------------------------