[pvs-sbcl] Adapt to Emacs 24. Minor spec file cleanups.

[Jerry James]

commit fb08d5bd13a31bb9c356693ff92f5d1b094fbae3
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Jan 20 13:16:29 2012 -0700

    Adapt to Emacs 24.
    Minor spec file cleanups.

 pvs-emacs.patch |   31 +++++++++++++++++++++++++++++++
 pvs-sbcl.spec   |   11 ++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/pvs-emacs.patch b/pvs-emacs.patch
new file mode 100644
index 0000000..ffeb70c
--- /dev/null
+++ b/pvs-emacs.patch
@@ -0,0 +1,31 @@
+--- ./emacs/go-pvs.el.orig	2011-04-15 11:45:06.000000000 -0600
++++ ./emacs/go-pvs.el	2012-01-20 13:08:55.657877570 -0700
+@@ -34,6 +34,8 @@
+ 	 'xemacs20)
+ 	((string-match "XEmacs 19" (emacs-version))
+ 	 'xemacs19)
++	((string-match "Emacs 24" (emacs-version))
++	 'emacs24)
+ 	((string-match "Emacs 23" (emacs-version))
+ 	 'emacs23)
+ 	((string-match "Emacs 22" (emacs-version))
+--- ./Makefile.in.orig	2012-01-20 13:07:52.481808494 -0700
++++ ./Makefile.in	2012-01-20 13:10:10.316958316 -0700
+@@ -132,6 +132,9 @@ emacsversion = $(shell expr "`$(EMACS) -
+                             : '[^X]*\(X*Emacs [0-9][0-9]\)')
+ 
+ 
++ifeq ($(emacsversion),Emacs 24)
++EMACSSUBDIR = emacs24
++else
+ ifeq ($(emacsversion),Emacs 23)
+ EMACSSUBDIR = emacs23
+ else
+@@ -157,6 +160,7 @@ $(error "Unknown version of (X)Emacs: $(
+ endif
+ endif
+ endif
++endif
+ endif
+ endif
+ endif
diff --git a/pvs-sbcl.spec b/pvs-sbcl.spec
index 7d87fbf..f5f55c8 100644
--- a/pvs-sbcl.spec
+++ b/pvs-sbcl.spec
@@ -24,6 +24,8 @@ Patch1:         pvs-hashfn.patch
 # path is passed to a function that expects an absolute path, thereby breaking
 # the chmod function 
 Patch2:         pvs-chmod.patch
+# This patch was sent upstream 20 Jan 2012.  It adapts to Emacs 24.
+Patch3:         pvs-emacs.patch
 
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
@@ -34,8 +36,7 @@ BuildRequires:  texi2html
 BuildRequires:  texinfo-tex
 BuildRequires:  tex(latex)
 BuildRequires:  emacs
-BuildRequires:  emacs-el
-BuildRequires:  xemacs-devel
+BuildRequires:  xemacs
 BuildRequires:  xemacs-packages-extra
 Requires:       tex(latex)
 Requires(postun): tex(tex)
@@ -67,6 +68,7 @@ the lvm2 package.
 %patch0
 %patch1
 %patch2
+%patch3
 
 # Upstream didn't give us a configure script
 autoreconf -i
@@ -133,7 +135,6 @@ sed -i -e "s,^PVSPATH=.*$,PVSPATH=%{_libdir}/pvs," proveit
 sed -i -e "s,^\$PVSPATH=.*$,\$PVSPATH=%{_libdir}/pvs," provethem
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pvs/doc/release-notes
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -156,7 +157,6 @@ desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE5}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
 rm -f /tmp/pvs-*.p1
 
 %postun
@@ -170,7 +170,6 @@ fi
 update-desktop-database %{_datadir}/applications &>/dev/null ||:
 
 %files
-%defattr(-,root,root,-)
 %doc *.ps.gz *.pdf LICENSE NOTICES README Examples
 %doc doc/PVSio-2.d.pdf doc/api/pvs-api.pdf
 %doc doc/language/language.pdf
@@ -185,6 +184,8 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||:
 - rebuild (sbcl)
 - Adapt to new fixnum size
 - Fix the (chmod) function
+- Adapt to Emacs 24
+- Minor spec file cleanups
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild