rpms/emacs-vm/devel .cvsignore, 1.5, 1.6 emacs-vm.spec, 1.7, 1.8 sources, 1.5, 1.6

Mon Jun 18 23:40:47 UTC 2007

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15108

Modified Files:
	.cvsignore emacs-vm.spec sources 
Log Message:
* Tue Jun 19 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.0.453-1
- Update to version 8.0.0 devo 453 which removes the need for thr vmrf patch
- No longer need to bundle vcard stuff as that is included upstream
- Spec file cleanups
- No longer use separate pixmaps



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	18 Mar 2007 21:18:44 -0000	1.5
+++ .cvsignore	18 Jun 2007 23:40:10 -0000	1.6
@@ -1,6 +1,2 @@
-vm-7.19.tar.gz
-vm-7.19-devo-282.patch.gz
-pixmaps-small-fuzzy.tar.gz
+vm-8.0.0-453.tgz
 u-vm-color.el
-vcard.el
-vm-vcard.el


Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-vm.spec	16 May 2007 23:19:20 -0000	1.7
+++ emacs-vm.spec	18 Jun 2007 23:40:10 -0000	1.8
@@ -1,32 +1,28 @@
-# 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
-# version number to the patch filename.
-#
-# Vcard handling has been added - see Source21-22. These were pulled from
-# http://www.splode.com/users/friedman/software/emacs-lisp/ on 10th February
-# 2007. 
-#
-# Font-lock support of message bodies was added (Source31) from 
+# Font-lock support of message bodies was added (Source1) from 
 # http://de.geocities.com/ulf_jasper/emacs.html on 10th February 2007.
 
-%define vmversion 7.19
-%define vmrfversion devo282
+# 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.0
+%define devoversion 453
+
+
+%define pkgdir %{_datadir}/emacs/site-lisp/vm
+%define pixmapdir %{pkgdir}/pixmaps
+%define startd %{_datadir}/emacs/site-lisp/site-start.d/
+%define initfile %{startd}/vm-mode-init.el
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
-Version: %{vmversion}.%{vmrfversion}
-Release: 11%{?dist}
+Version: %{vmversion}.%{devoversion}
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
-URL: http://www.wonderworks.com/vm/
+URL: http://www.nongnu.org/viewmail/
 
-Source0: http://www.seanet.com/~kylemonger/vm/vm-%{vmversion}.tar.gz
-Source1: pixmaps-small-fuzzy.tar.gz
-Source21: vcard.el
-Source22: vm-vcard.el
-Source31: u-vm-color.el
-Patch0: vm-7.19-devo-282.patch.gz
+Source0: http://download.savannah.nongnu.org/releases/viewmail/vm-%{vmversion}-%{devoversion}.tgz
+Source1: u-vm-color.el
 
 Requires: emacs
 Requires(pre): /sbin/install-info 
@@ -43,10 +39,6 @@
 digests, message forwarding, and organizing message presentation
 according to various criteria. 
 
-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.
-
 %package el
 Group: Applications/Internet
 Summary: Elisp source files for VM mailreader for emacs
@@ -57,75 +49,56 @@
 package. It is not necessary to install this if you want to run vm.
 
 %prep
-%setup -q -n vm-%{vmversion}
-
-tar -zxf %SOURCE1
-cp pixmaps-small-fuzzy/* pixmaps/
+%setup -q -n vm-%{vmversion}-%{devoversion}
 
-%patch0 -p1 
-mv Makefile Makefile.bk
-sed -e 's/mkdirhier/mkdir -p/g' Makefile.bk > Makefile
-
-cp %{SOURCE21} .
-cp %{SOURCE22} .
-cp %{SOURCE31} .
+# Add u-vm-color.el and patch Makefile.in to byte compile u-vm-color.el
+cp %{SOURCE1} lisp
+(cd lisp
+mv Makefile.in Makefile.in.bak
+sed -e '/SOURCES =/ a SOURCES += u-vm-color.el' Makefile.in.bak > Makefile.in)
 
 %build
-%define pkgdir %{_datadir}/emacs/site-lisp/vm
-%define pixmapdir %{pkgdir}/pixmaps
-
 export CFLAGS="$RPM_OPT_FLAGS"
-
-make %{?_smp_mflags} all \
-	prefix=%{_prefix} \
-  	INFODIR=%{_infodir} \
-  	LISPDIR=%{pkgdir} \
-  	BINDIR=%{_bindir} \
-  	PIXMAPDIR=%{pixmapdir} \
-	EMACS=emacs
+%configure
+make
 
 %install
 rm -rf %{buildroot}
-echo %{buildroot}%{_prefix} 
-make install \
-  	prefix=%{buildroot}%{_prefix} \
-  	INFODIR=%{buildroot}%{_infodir} \
-  	LISPDIR=%{buildroot}%{pkgdir} \
-  	BINDIR=%{buildroot}%{_bindir} \
-  	PIXMAPDIR=%{buildroot}%{pixmapdir}
 
-cp *.el %{buildroot}%{pkgdir}
+install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_infodir}
 
-%define startd %{_datadir}/emacs/site-lisp/site-start.d/
-%define initfile %{startd}/vm-mode-init.el
+make install \
+  prefix=%{buildroot}%{_prefix} \
+  bindir=%{buildroot}%{_bindir} \
+  info_dir=%{buildroot}%{_infodir}
+
+# Copy source lisp files into buildroot for emacs-vm-el sub-package
+(cd lisp ; install -m 644 *.el %{buildroot}%{pkgdir})
 
 # Create initialization file.
 install -d %{buildroot}/%{startd}
 cat > %{buildroot}/%{initfile} <<EOF
+;; Startup settings for VM
 (setq vm-toolbar-pixmap-directory "%{pixmapdir}")
 (setq vm-image-directory "%{pixmapdir}")
-(autoload 'vm "vm" "Start VM on your primary inbox." t)
-(autoload 'vm-other-frame "vm" "Like \`vm' but starts in another frame." t)
-(autoload 'vm-visit-folder "vm" "Start VM on an arbitrary folder." t)
-(autoload 'vm-visit-virtual-folder "vm" "Visit a VM virtual folder." t)
-(autoload 'vm-mode "vm" "Run VM major mode on a buffer" t)
-(autoload 'vm-mail "vm" "Send a mail message using VM." t)
-(autoload 'vm-submit-bug-report "vm" "Send a bug report about VM." t)
+(require 'vm-autoloads)
 
 ;; Settings for u-vm-color.el 
 (require 'u-vm-color)
 (add-hook 'vm-summary-mode-hook 'u-vm-color-summary-mode)
 (add-hook 'vm-select-message-hook 'u-vm-color-fontify-buffer)
+
+(defadvice vm-fill-paragraphs-containing-long-lines
+    (after u-vm-color activate)
+    (u-vm-color-fontify-buffer))
 EOF
 
 %clean
 rm -rf %{buildroot}
 
 %post 
-# Without the --entry part here, we get a malformed entry in info.
-/sbin/install-info \
-  --entry="* VM: (vm).       An Emacs mailreader" \
-  %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || :
 
 %preun
 if [ "$1" = "0" ] ; then 
@@ -147,7 +120,13 @@
 %{pkgdir}/*.el
 
 %changelog
-* Thu May 17 2007 Jonathan G. Underwood <rpmb at renton.jgu> - 7.19.devo282-11
+* Tue Jun 19 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.0.453-1
+- Update to version 8.0.0 devo 453 which removes the need for thr vmrf patch
+- No longer need to bundle vcard stuff as that is included upstream
+- Spec file cleanups
+- No longer use separate pixmaps
+
+* Thu May 17 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 7.19.devo282-11
 - Fix missnaming of startup file
 - Fix changelog entry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Mar 2007 21:18:44 -0000	1.5
+++ sources	18 Jun 2007 23:40:10 -0000	1.6
@@ -1,6 +1,2 @@
-7866f6243e398d76ae32356a4af76fa3  vm-7.19.tar.gz
-fadfef52b6b8eded9a84afdcd0282de9  vm-7.19-devo-282.patch.gz
-27e7b1da04d4976a8d33c9d2a6033e24  pixmaps-small-fuzzy.tar.gz
+d0e7ea8ab75fd380f26a3506d1f1d73d  vm-8.0.0-453.tgz
 55a7c54b0de0959550675c18016073a1  u-vm-color.el
-1ae781a8e5565b5ba88b74a507a84822  vcard.el
-e7269b9591ba0378f445097e494e312c  vm-vcard.el


