From 9888f7388d441630699be8ce478cf82304b2d8b5 Mon Sep 17 00:00:00 2001 From: Jonathan G. Underwood Date: Mar 30 2010 22:08:30 +0000 Subject: - Update rpm-spec-mode.el and friends --- diff --git a/emacs.spec b/emacs.spec index 70f1306..9a00692 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -421,6 +421,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %dir %{_datadir}/emacs/%{version} %changelog +* Tue Mar 30 2010 Jonathan G. Underwood - 1:23.1-10 +- Update rpm-spec-mode.el and friends + * Tue Mar 30 2010 Jonathan G. Underwood - 1:23.1-9 - Add fix for BZ 53346 - Backport of bugfixes from F-12 branch (spec file changelog entries follow) diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el index 4a8bf34..27e30e6 100644 --- a/rpm-spec-mode.el +++ b/rpm-spec-mode.el @@ -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) diff --git a/rpm-spec-mode.patch b/rpm-spec-mode.patch index f1c97ed..b9113f7 100644 --- a/rpm-spec-mode.patch +++ b/rpm-spec-mode.patch @@ -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."