rpms/emacs-vm/F-7 emacs-vm.spec,1.17,1.18

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/emacs-vm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9059

Modified Files:
	emacs-vm.spec 
Log Message:
* Sun Oct 14 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
- Add support for BBDB
- Add support for pkg-config setting of Emacs specific variables



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/F-7/emacs-vm.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- emacs-vm.spec	30 Aug 2007 21:03:33 -0000	1.17
+++ emacs-vm.spec	16 Oct 2007 19:39:15 -0000	1.18
@@ -7,16 +7,35 @@
 %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 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-config emacs --variable sitestartdir)
+%endif
 
-%define pkgdir %{_datadir}/emacs/site-lisp/vm
+%define pkgdir %{emacs_lispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
-%define startd %{_datadir}/emacs/site-lisp/site-start.d/
-%define initfile %{startd}/vm-mode-init.el
+%define initfile %{emacs_startdir}/vm-mode-init.el
 
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: %{vmversion}.%{devoversion}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: http://www.nongnu.org/viewmail/
@@ -25,11 +44,16 @@
 Source1: u-vm-color.el
 Patch0: vm-8.0.3-fix-Makefile.patch
 
-Requires: emacs
+Requires: emacs >= %{emacs_version}
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: emacs texinfo texinfo-tex
+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
@@ -82,7 +106,7 @@
 (cd lisp ; install -m 644 *.el %{buildroot}%{pkgdir})
 
 # Create initialization file.
-install -d %{buildroot}/%{startd}
+install -d %{buildroot}/%{emacs_startdir}
 cat > %{buildroot}/%{initfile} <<EOF
 ;; Startup settings for VM
 (setq vm-toolbar-pixmap-directory "%{pixmapdir}")
@@ -125,6 +149,10 @@
 %{pkgdir}/*.el
 
 %changelog
+* Sun Oct 14 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
+- Add support for BBDB
+- Add support for pkg-config setting of Emacs specific variables
+
 * Thu Aug 30 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-3
 - Fix problem with vm-autoloads.el RH BZ #262361