rpms/emacs-vm/FC-6 emacs-vm.spec,1.4,1.5

[Jonathan G. Underwood (jgu)]

Author: jgu

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

Modified Files:
	emacs-vm.spec 
Log Message:
* Sun Mar 18 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 7.19.devo282-8
- Redefine version to include vmrf patch version (devo282)
- Remove pointless %{pkg} macro
- Add new pixmaps with better sizing (still ugly though)
- Renamed the vmrf patch to include the version



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/FC-6/emacs-vm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emacs-vm.spec	10 Feb 2007 20:47:55 -0000	1.4
+++ emacs-vm.spec	18 Mar 2007 21:06:52 -0000	1.5
@@ -1,7 +1,7 @@
 # Upstream vm (http://www.wonderworks.com/vm/) seems to be currently
 # unmaintained. This package adds the patchset maintained by Robert Widhopf-Fenk
-# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz).I have manually added a
-# minor version number to the patch (YYMMDD) to indicate when it was downloaded.
+# (http://www.robf.de/Hacking/elisp/vm-7.19.patch.gz). I have manually added a
+# version number to the patch filename.
 #
 # In order to make the PGP stuff work with GNU Emacs <22, I have pulled pgp*.el
 # from the GNU Emacs CVS - see Source11-16. These were pulled from CVS on 10th
@@ -14,16 +14,19 @@
 # Font-lock support of message bodies was added (Source31) from 
 # http://de.geocities.com/ulf_jasper/emacs.html on 10th February 2007.
 
-%define pkg vm
+%define vmversion 7.19
+%define vmrfversion devo282
 
 Summary: Emacs VM mailreader
-Name: emacs-%{pkg}
-Version: 7.19
-Release: 7%{?dist}
+Name: emacs-vm
+Version: %{vmversion}.%{vmrfversion}
+Release: 8%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.wonderworks.com/vm/
-Source0: http://www.seanet.com/~kylemonger/vm/%{pkg}-%{version}.tar.gz
+
+Source0: http://www.seanet.com/~kylemonger/vm/vm-%{vmversion}.tar.gz
+Source1: pixmaps-small-fuzzy.tar.gz
 Source11: pgg.el
 Source12: pgg-def.el
 Source13: pgg-gpg.el
@@ -33,7 +36,8 @@
 Source21: vcard.el
 Source22: vm-vcard.el
 Source31: u-vm-color.el
-Patch0: vm-7.19.070203.patch.gz
+Patch0: vm-7.19-devo-282.patch.gz
+
 Requires: emacs
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
@@ -49,7 +53,7 @@
 digests, message forwarding, and organizing message presentation
 according to various criteria. 
 
-This package includes Robert widhopf-Fenk's patchset
+This package includes Robert widhopf-Fenk's patchset %{vmrfversion}
 (http://www.robf.de/Hacking/elisp/). Please read that webpage to find
 out how to configure the extra features offered by that patchset.
 
@@ -63,7 +67,10 @@
 package. It is not necessary to install this if you want to run vm.
 
 %prep
-%setup -q -n %{pkg}-%{version}
+%setup -q -n vm-%{vmversion}
+
+tar -zxf %SOURCE1
+cp pixmaps-small-fuzzy/* pixmaps/
 
 %patch0 -p1 
 mv Makefile Makefile.bk
@@ -106,7 +113,7 @@
 cp *.el %{buildroot}%{pkgdir}
 
 %define startd %{_datadir}/emacs/site-lisp/site-start.d/
-%define initfile %{startd}/%{pkg}-mode-init.el
+%define initfile %{startd}/vm-mode-init.el
 
 # Create initialization file.
 install -d %{buildroot}/%{startd}
@@ -156,6 +163,12 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sun Mar 18 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 7.19.devo282-8
+- Redefine version to include vmrf patch version (devo282)
+- Remove pointless %%{pkg} macro
+- Add new pixmaps with better sizing (still ugly though)
+- Renamed the vmrf patch to include the version
+
 * Sat Feb 10 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 7.19-7
 - Added pgg*.el from Emacs 22 CVS
 - Added u-vm-color.el from http://de.geocities.com/ulf_jasper/emacs.html