rpms/emacs-vm/devel emacs-vm.spec,1.22,1.23

[Jonathan G. Underwood (jgu)]

Author: jgu

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

Modified Files:
	emacs-vm.spec 
Log Message:
* Sat Oct 13 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-7
- Fix typo in emacs_startdir macro
- Add ability to build with BBDB support



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- emacs-vm.spec	9 Sep 2007 12:25:16 -0000	1.22
+++ emacs-vm.spec	12 Oct 2007 23:23:15 -0000	1.23
@@ -7,16 +7,25 @@
 %define vmversion 8.0.3
 %define devoversion 495
 
+# 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
+# at build time. Hence there is a circular BuildRequires and bootstrapping is
+# required. The way to do this is (i) build emacs-vm without BuildRequires:
+# emacs-bbdb-el (ii) build emacs-bbdb with BuildRequires: emacs-vm-el (iii)
+# 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 21.4
+%define emacs_version 22.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-coonfig emacs --variable sitestartdir)
+%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
 %endif
 
 %define pkgdir %{emacs_lispdir}/vm
@@ -26,7 +35,7 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -41,6 +50,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: emacs emacs-el texinfo texinfo-tex
 
+%if %{bbdbsupport}
+BuildRequires: emacs-bbdb-el
+Requires: emacs-bbdb
+%endif
+
 %description
 VM (View Mail) is an Emacs subsystem that allows UNIX mail to be read
 and disposed of within Emacs.  Commands exist to do the normal things
@@ -135,6 +149,10 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sat Oct 13 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-7
+- Fix typo in emacs_startdir macro
+- Add ability to build with BBDB support
+
 * Sun Sep  9 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-6
 - Fix typo with start file creation