rpms/emacs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update rpm-spec-mode to latest upstream version (#524851)

Browse Source
This commit is contained in:
Daniel Novotny 2009-09-23 10:42:24 +00:00
parent d63f2b2d7d
commit 1f15d928ee
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emacs.spec
View File

@ -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 emacs.etags %{_bindir}/etags.emacs 80 \
%dir %{_datadir}/emacs/%{version}
%changelog
* Wed Sep 23 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-8
- updated rpm-spec-mode.el to latest upstream version (#524851)
* Tue Sep 22 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-7
- updated %%info_files (#510750)

12
rpm-spec-mode.el
View File

@ -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-address'."
(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-address'."
'(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)

4
rpm-spec-mode.patch
View File

@ -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."