rpms/emacs/devel emacs.spec, 1.137, 1.138 rpm-spec-mode.el, 1.11, 1.12 rpm-spec-mode.patch, 1.1, 1.2
Daniel Novotny
dnovotny at fedoraproject.org
Wed Sep 23 10:42:24 UTC 2009
Author: dnovotny
Update of /cvs/extras/rpms/emacs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13921
Modified Files:
emacs.spec rpm-spec-mode.el rpm-spec-mode.patch
Log Message:
update rpm-spec-mode to latest upstream version (#524851)
Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- emacs.spec 22 Sep 2009 08:57:39 -0000 1.137
+++ emacs.spec 23 Sep 2009 10:42:24 -0000 1.138
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 23.1
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -375,6 +375,9 @@ alternatives --install %{_bindir}/etags
%dir %{_datadir}/emacs/%{version}
%changelog
+* Wed Sep 23 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-8
+- updated rpm-spec-mode.el to latest upstream version (#524851)
+
* Tue Sep 22 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-7
- updated %%info_files (#510750)
Index: rpm-spec-mode.el
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/rpm-spec-mode.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rpm-spec-mode.el 8 Nov 2008 08:11:23 -0000 1.11
+++ rpm-spec-mode.el 23 Sep 2009 10:42:24 -0000 1.12
@@ -63,7 +63,7 @@
;;; Code:
-(defconst rpm-spec-mode-version "0.12.1x" "Version of `rpm-spec-mode'.")
+(defconst rpm-spec-mode-version "0.12.3x" "Version of `rpm-spec-mode'.")
(defgroup rpm-spec nil
"RPM spec mode with Emacs/XEmacs enhancements."
@@ -252,7 +252,7 @@ value returned by function `user-mail-ad
(eval-when-compile
(concat "^%"
(regexp-opt
- ;; From RPM 4.4.9 sources, file build/parseSpec.c: partList[].
+ ;; From RPM 4.6.0 sources, file build/parseSpec.c: partList[].
'("build" "changelog" "check" "clean" "description" "files"
"install" "package" "post" "postun" "pretrans" "posttrans"
"pre" "prep" "preun" "trigger" "triggerin" "triggerpostun"
@@ -602,7 +602,7 @@ value returned by function `user-mail-ad
'(1 'rpm-spec-tag-face))
'("%\\(de\\(fine\\|scription\\)\\|files\\|global\\|package\\)[ \t]+\\([^-][^ \t\n]*\\)"
(3 rpm-spec-package-face))
- '("%p\\(ost\\|re\\)\\(un\\)?[ \t]+\\([^-][^ \t\n]*\\)"
+ '("%p\\(ost\\|re\\)\\(un\\|trans\\)?[ \t]+\\([^-][^ \t\n]*\\)"
(3 rpm-spec-package-face))
'("%configure " 0 rpm-spec-macro-face)
'("%dir[ \t]+\\([^ \t\n]+\\)[ \t]*" 1 rpm-spec-dir-face)
@@ -1255,8 +1255,8 @@ See `search-forward-regexp'."
(let ((str
(progn
(goto-char (point-min))
- (search-forward-regexp (concat "^"
- field ":[ \t]*\\(.*?\\)[ \t]*$") max)
+ (search-forward-regexp
+ (concat "^" field ":[ \t]*\\(.*?\\)[ \t]*$") max)
(match-string 1))))
;; Try to expand macros
(if (string-match "\\(%{?\\(\\?\\)?\\)\\([a-zA-Z0-9_]*\\)\\(}?\\)" str)
@@ -1299,7 +1299,7 @@ if one is present in the file."
(let ((str
(progn
(goto-char (point-min))
- (search-forward-regexp (concat "Release[ \t]*:[ \t]*\\(.+\\).*$") nil)
+ (search-forward-regexp "^Release[ \t]*:[ \t]*\\(.+\\).*$" nil)
(match-string 1))))
(let ((inrel
(if (string-match "%{?\\([^}]*\\)}?$" str)
rpm-spec-mode.patch:
rpm-spec-mode.el | 55 +++++++++++++++++++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 20 deletions(-)
Index: rpm-spec-mode.patch
===================================================================
RCS file: /cvs/extras/rpms/emacs/devel/rpm-spec-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpm-spec-mode.patch 23 Apr 2008 14:48:36 -0000 1.1
+++ rpm-spec-mode.patch 23 Sep 2009 10:42:24 -0000 1.2
@@ -4,10 +4,10 @@
;;; Code:
--(defconst rpm-spec-mode-version "0.12.1x" "Version of `rpm-spec-mode'.")
+-(defconst rpm-spec-mode-version "0.12.3x" "Version of `rpm-spec-mode'.")
+(require 'compile)
+
-+(defconst rpm-spec-mode-version "0.12.1x.rh1" "Version of `rpm-spec-mode'.")
++(defconst rpm-spec-mode-version "0.12.3x.rh1" "Version of `rpm-spec-mode'.")
(defgroup rpm-spec nil
"RPM spec mode with Emacs/XEmacs enhancements."
More information about the fedora-extras-commits
mailing list