rpms/emacs-vm/devel .cvsignore, 1.16, 1.17 emacs-vm.spec, 1.37, 1.38 sources, 1.16, 1.17 vm-8.0.12-fix-charsets.patch, 1.1, NONE vm-8.0.12-fix-missing-autoload.patch, 1.1, NONE

[Jonathan G. Underwood]

Author: jgu

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

Modified Files:
	.cvsignore emacs-vm.spec sources 
Removed Files:
	vm-8.0.12-fix-charsets.patch 
	vm-8.0.12-fix-missing-autoload.patch 
Log Message:
* Fri Dec 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-1
- Update to 8.0.14
- Drop old macros for emacspackaging and use _emacs macros
- Remove BuildRoot definition
- No longer delete buildroot at beginning of install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Nov 2008 00:35:17 -0000	1.16
+++ .cvsignore	18 Dec 2009 23:12:41 -0000	1.17
@@ -1 +1 @@
-vm-8.0.12.tgz
+vm-8.0.14.tgz


Index: emacs-vm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- emacs-vm.spec	16 Sep 2009 11:25:09 -0000	1.37
+++ emacs-vm.spec	18 Dec 2009 23:12:41 -0000	1.38
@@ -10,39 +10,23 @@
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define bbdbsupport 1
 
-# If the emacs-el package has installed a pkgconfig file, use that to determine
-# install locations and Emacs version at build time, otherwise set defaults.
-%if %($(pkg-config emacs) ; echo $?)
-%define emacs_version 23.1
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
-%endif
-
-%define pkgdir %{emacs_lispdir}/vm
+%define pkgdir %{_emacs_sitelispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
-%define initfile %{emacs_startdir}/vm-mode-init.el
+%define initfile %{_emacs_sitestartdir}/vm-mode-init.el
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
-Version: 8.0.12
-Release: 6%{?dist}
+Version: 8.0.14
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
-URL: http://www.nongnu.org/viewmail/
-Source0: http://download.savannah.nongnu.org/releases/viewmail/vm-%{version}.tgz
+URL: https://launchpad.net/vm
+Source0: http://launchpad.net/vm/8.0.x/%{version}/+download/vm-%{version}.tgz
 
-Patch0: vm-8.0.12-fix-missing-autoload.patch
-Patch1: vm-8.0.12-fix-charsets.patch
-
-Requires: emacs >= %{emacs_version}
+Requires: emacs >= %{_emacs_version}
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires: emacs emacs-el texinfo texinfo-tex
+BuildRequires: emacs texinfo texinfo-tex
 
 %if %{bbdbsupport}
 BuildRequires: emacs-bbdb-el
@@ -70,11 +54,7 @@ package. It is not necessary to install 
 %prep
 %setup -q -n vm-%{version}
 
-%patch0 -p1 -b .fix-missing-autoload
-%patch1 -p1 -b .fix-charsets.patch
-
 # Add missing entry for u-vm-color.el to lisp Makefile.in
-# This shouldn't be necessary after 8.0.12 
 sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in
 
 %build
@@ -83,8 +63,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
 make
 
 %install
-rm -rf %{buildroot}
-
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_infodir}
 
@@ -98,7 +76,7 @@ make install \
 (cd lisp ; install -p -m 644 *.el %{buildroot}%{pkgdir})
 
 # Create initialization file.
-install -d %{buildroot}/%{emacs_startdir}
+install -d %{buildroot}/%{_emacs_sitestartdir}
 cat > %{buildroot}/%{initfile} <<EOF
 ;; Startup settings for VM
 (setq vm-toolbar-pixmap-directory "%{pixmapdir}")
@@ -141,6 +119,12 @@ fi
 %{pkgdir}/*.el
 
 %changelog
+* Fri Dec 18 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.14-1
+- Update to 8.0.14
+- Drop old macros for emacspackaging and use _emacs macros
+- Remove BuildRoot definition
+- No longer delete buildroot at beginning of install
+
 * Wed Sep 16 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.12-6
 - Bump release to fix up cvs problem
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-vm/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	7 Nov 2008 00:35:17 -0000	1.16
+++ sources	18 Dec 2009 23:12:41 -0000	1.17
@@ -1 +1 @@
-b761ef5d3125d36a44d37626764d8e70  vm-8.0.12.tgz
+35657d3d3dec1dcce5b31ac155e0cc4f  vm-8.0.14.tgz


--- vm-8.0.12-fix-charsets.patch DELETED ---


--- vm-8.0.12-fix-missing-autoload.patch DELETED ---