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

[Jonathan G. Underwood (jgu)]

Author: jgu

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

Modified Files:
	emacs-vm.spec 
Added Files:
	vm-8.0.3-emacs21-fix-Makefile.patch 
Removed Files:
	vm-8.0.3-emacs21-build-fix.patch 
Log Message:
* Thu Aug 30 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-3
- Fix problem with vm-autoloads.el RH BZ #262361 


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

--- NEW FILE vm-8.0.3-emacs21-fix-Makefile.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 'vm '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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- emacs-vm.spec	22 Aug 2007 13:00:03 -0000	1.20
+++ emacs-vm.spec	30 Aug 2007 21:17:00 -0000	1.21
@@ -19,7 +19,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -33,7 +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
+Patch1: vm-8.0.3-emacs21-fix-Makefile.patch
 
 Requires: emacs
 Requires(pre): /sbin/install-info 
@@ -139,6 +139,9 @@
 %{pkgdir}/*.el
 
 %changelog
+* Thu Aug 30 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-3
+- Fix problem with vm-autoloads.el RH BZ #262361 
+
 * 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 DELETED ---