rpms/emacs-vm/devel .cvsignore, 1.15, 1.16 emacs-vm.spec, 1.31, 1.32 sources, 1.15, 1.16

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23363

Modified Files:
	.cvsignore emacs-vm.spec sources 
Log Message:
* Fri Nov  7 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-1
- Update to version 8.0.12
- Remove u-vm-color.el (now included with upstream VM)
- Remove hack to add vm-revno.el to lisp files
- Drop devo number stuff, since upstream seems to have stopped using the
  revision number in the release tarball name (finally!) 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Sep 2008 11:39:40 -0000	1.15
+++ .cvsignore	7 Nov 2008 00:35:17 -0000	1.16
@@ -1,2 +1 @@
-vm-8.0.11-581.tgz
-u-vm-color.el
+vm-8.0.12.tgz


Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- emacs-vm.spec	29 Sep 2008 20:37:29 -0000	1.31
+++ emacs-vm.spec	7 Nov 2008 00:35:17 -0000	1.32
@@ -1,12 +1,6 @@
 # Font-lock support of message bodies was added (Source1) from 
 # http://de.geocities.com/ulf_jasper/emacs.html on 10th February 2007.
 
-# Upstream used rather odd versioning: there is a version number, and then a
-# "devo" number which is the BZR tree revision, separated with a hypen. However,
-# rpm doesn't allow a hyphen in the versoion number.
-%define vmversion 8.0.11
-%define devoversion 581
-
 # Note on building VM with support for bbdb: if support for VM in BBDB is
 # required, then the source elisp for VM must be installed at build time. If
 # support for BBDB is required in VM, then the BBDB source elisp must be present
@@ -34,14 +28,13 @@
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
-Version: %{vmversion}.%{devoversion}
-Release: 2%{?dist}
+Version: 8.0.12
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
 
-Source0: http://download.savannah.nongnu.org/releases/viewmail/vm-%{vmversion}-%{devoversion}.tgz
-Source1: http://ulf.epplejasper.de/downloads/u-vm-color.el
+Source0: http://download.savannah.nongnu.org/releases/viewmail/vm-%{version}.tgz
 
 Requires: emacs >= %{emacs_version}
 Requires(pre): /sbin/install-info 
@@ -73,14 +66,7 @@
 package. It is not necessary to install this if you want to run vm.
 
 %prep
-%setup -q -n vm-%{vmversion}-%{devoversion}
-
-# Add u-vm-color.el and patch Makefile.in to byte compile u-vm-color.el
-cp %{SOURCE1} lisp
-sed -i -e '/SOURCES =/ a SOURCES += u-vm-color.el' lisp/Makefile.in
-
-# Add vm-revno.el to sources - this is missing in 8.0.11
-sed -i -e '/SOURCES =/ a SOURCES += vm-revno.el' lisp/Makefile.in
+%setup -q -n vm-%{version}
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -146,6 +132,13 @@
 %{pkgdir}/*.el
 
 %changelog
+* Fri Nov  7 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-1
+- Update to version 8.0.12
+- Remove u-vm-color.el (now included with upstream VM)
+- Remove hack to add vm-revno.el to lisp files
+- Drop devo number stuff, since upstream seems to have stopped using the
+  revision number in the release tarball name (finally!) 
+
 * Mon Sep 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.11.581-2
 - Add vm-revno.el to lisp files
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	27 Sep 2008 11:39:40 -0000	1.15
+++ sources	7 Nov 2008 00:35:17 -0000	1.16
@@ -1,2 +1 @@
-a66fb12d5bf02179fa053da4a0570129  vm-8.0.11-581.tgz
-fa145ca291d5717072349d055512559c  u-vm-color.el
+b761ef5d3125d36a44d37626764d8e70  vm-8.0.12.tgz