rpms/emacs-vm/FC-6 vm-8.0.3-emacs21-build-fix.patch, NONE, 1.1 emacs-vm.spec, 1.19, 1.20

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7004

Modified Files:
	emacs-vm.spec 
Added Files:
	vm-8.0.3-emacs21-build-fix.patch 
Log Message:
* Wed Aug 22 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-2
- Add patch to fix building 8.0.3 with Emacs 21 rather than the hack
- Add back in the extra lisp files once more


vm-8.0.3-emacs21-build-fix.patch:

--- NEW FILE vm-8.0.3-emacs21-build-fix.patch ---
--- lisp/Makefile.in.orig	2007-08-15 22:09:16.000000000 +0100
+++ lisp/Makefile.in	2007-08-22 13:27:06.000000000 +0100
@@ -59,7 +59,7 @@
 
 # to list of object files 
 ifeq (@EMACS_FLAVOR@,emacs)
-OBJECTS = vm-autoloads.elc vm-cus-load.elc
+OBJECTS = vm-autoloads.elc cus-load.elc
 else
 OBJECTS = auto-autoloads.elc custom-load.elc
 endif
@@ -125,12 +125,12 @@
 	(build_dir="`pwd`"; cd "@srcdir@"; \
 	 "$(EMACS_PROG)" $(FLAGS) -l autoload \
 		-f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
-	echo "(custom-add-load 'vm-cus-load)" >> $@	
+	echo "(custom-add-load 'cus-load)" >> $@	
 	echo "(setq vm-configure-datadir \"${datadir}\")" >> $@
 	echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" >> $@
 	echo "(provide 'vm-autoloads)" >> $@
 
-vm-cus-load.el: $(SRCS:%=@srcdir@/%)
+cus-load.el: $(SRCS:%=@srcdir@/%)
 	"$(EMACS_PROG)" $(FLAGS) -f vm-custom-make-dependencies .
 
 ##############################################################################


Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/FC-6/emacs-vm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- emacs-vm.spec	22 Aug 2007 11:39:42 -0000	1.19
+++ emacs-vm.spec	22 Aug 2007 13:00:03 -0000	1.20
@@ -19,7 +19,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 1%{?dist}.3
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -33,6 +33,7 @@
 Source15: pgg-pgp.el
 Source16: pgg-pgp5.el
 Patch0: makefile-add-extra-lisp.patch
+Patch1: vm-8.0.3-emacs21-build-fix.patch
 
 Requires: emacs
 Requires(pre): /sbin/install-info 
@@ -62,20 +63,17 @@
 %setup -q -n vm-%{vmversion}-%{devoversion}
 
 # Add extra elisp source files and modify Makefile.in so they get compiled
-# cp %{SOURCE1} lisp
-# cp %{SOURCE11} lisp
-# cp %{SOURCE12} lisp
-# cp %{SOURCE13} lisp
-# cp %{SOURCE14} lisp
-# cp %{SOURCE15} lisp
-# cp %{SOURCE16} lisp
-# %patch0
-
-# Nasty hack to fix the bug which stops vm-cus-load.el being used. This should
-# not be needed for any version other than 8.0.3
-(cd lisp
-mv Makefile.in Makefile.in.bak
-sed -e 's/vm-cus-load/cus-load/g' Makefile.in.bak > Makefile.in)
+cp %{SOURCE1} lisp
+cp %{SOURCE11} lisp
+cp %{SOURCE12} lisp
+cp %{SOURCE13} lisp
+cp %{SOURCE14} lisp
+cp %{SOURCE15} lisp
+cp %{SOURCE16} lisp
+%patch0
+
+# Fix build issue specific to using Emacs 21 to build 8.0.3
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -141,6 +139,10 @@
 %{pkgdir}/*.el
 
 %changelog
+* Wed Aug 22 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-2
+- Add patch to fix building 8.0.3 with Emacs 21 rather than the hack
+- Add back in the extra lisp files once more
+
 * Wed Aug 22 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-1.3
 - Fix bug with vm-cus-load.el not being gnerated, second attempt