rpms/emacs/devel emacs.spec, 1.100, 1.101 rpm-spec-mode.el, 1.8, 1.9 rpm-spec-mode.el-0.14-xemacs-compat.patch, 1.1, NONE

[Charles Coldwell (coldwell)]

Author: coldwell

Update of /cvs/pkgs/rpms/emacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10719

Modified Files:
	emacs.spec rpm-spec-mode.el 
Removed Files:
	rpm-spec-mode.el-0.14-xemacs-compat.patch 
Log Message:
* Tue Nov  6 2007 Chip Coldwell <coldwell at redhat.com> 22.1-8
- fix insufficient safe-mode checks (Resolves: bz367601)

* Thu Nov  1 2007 Chip Coldwell <coldwell at redhat.com> 22.1-7
- Update rpm-spec-mode to the current upstream, drop compat patch (bz306841)



Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- emacs.spec	24 Oct 2007 20:31:32 -0000	1.100
+++ emacs.spec	6 Nov 2007 16:28:20 -0000	1.101
@@ -3,7 +3,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 22.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -17,7 +17,6 @@
 Source8: php-mode-init.el
 Source9: ssl.el
 Source11: rpm-spec-mode-init.el
-Source12: rpm-spec-mode.el-0.14-xemacs-compat.patch
 Source13: focus-init.el
 Source14: po-mode.el
 Source15: po-mode-init.el
@@ -27,6 +26,7 @@
 Source20: igrep.el
 Source21: igrep-init.el
 Patch0: glibc-open-macro.patch
+Patch1: files-el.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -100,13 +100,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .glibc-open-macro
+%patch1 -p0 -b .files-el
 
 # install rest of site-lisp files
 ( cd site-lisp
   cp %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
   tar xfz %SOURCE7  # php-mode
-  # xemacs compat patch for rpm-spec-mode
-  patch < %SOURCE12
   # fix po-auto-replace-revision-date nil
   patch < %SOURCE16 )
 
@@ -299,6 +298,12 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Nov  6 2007 Chip Coldwell <coldwell at redhat.com> 22.1-8
+- fix insufficient safe-mode checks (Resolves: bz367601)
+
+* Thu Nov  1 2007 Chip Coldwell <coldwell at redhat.com> 22.1-7
+- Update rpm-spec-mode to the current upstream, drop compat patch (bz306841)
+
 * Wed Oct 24 2007 Jeremy Katz <katzj at redhat.com> - 22.1-6
 - Update rpm-spec-mode to the current upstream (#306841)
 


Index: rpm-spec-mode.el
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/rpm-spec-mode.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpm-spec-mode.el	24 Oct 2007 20:31:32 -0000	1.8
+++ rpm-spec-mode.el	6 Nov 2007 16:28:20 -0000	1.9
@@ -711,7 +711,7 @@
   (interactive "sChange log entry: ")
   (save-excursion
     (rpm-goto-section "changelog")
-    (let* ((address (or rpm-spec-user-mail-address (user-mail-address)))
+    (let* ((address (rpm-spec-user-mail-address))
            (fullname (or rpm-spec-user-full-name (user-full-name)))
            (string (concat "* " (substring (current-time-string) 0 11)
                            (substring (current-time-string) -4) " "
@@ -892,7 +892,7 @@
   (interactive "p")
   (beginning-of-line)
   (insert "Packager: " (or rpm-spec-user-full-name (user-full-name))
-          " <" (or rpm-spec-user-mail-address (user-mail-address)) ">\n"))
+          " <" (rpm-spec-user-mail-address) ">\n"))
 
 (defun rpm-change-packager (&optional arg)
   "Update Packager tag."
@@ -1383,6 +1383,18 @@
 
 ;;------------------------------------------------------------
 
+(defun rpm-spec-user-mail-address ()
+  "User mail address helper."
+  (cond
+   (rpm-spec-user-mail-address
+    rpm-spec-user-mail-address)
+   ((fboundp 'user-mail-address)
+    (user-mail-address))
+   (t
+    user-mail-address)))
+
+;;------------------------------------------------------------
+
 (defun rpm-about-rpm-spec-mode (&optional arg)
   "About `rpm-spec-mode'."
   (interactive "p")


--- rpm-spec-mode.el-0.14-xemacs-compat.patch DELETED ---