rpms/emacs-vm/devel emacs-vm.spec,1.19,1.20

[Jonathan G. Underwood (jgu)]

Author: jgu

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

Modified Files:
	emacs-vm.spec 
Log Message:
Add logic to allow for not having a pkg-config file present for Emacs at package
build time.



Index: emacs-vm.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-vm/devel/emacs-vm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- emacs-vm.spec	8 Sep 2007 14:27:52 -0000	1.19
+++ emacs-vm.spec	8 Sep 2007 22:01:29 -0000	1.20
@@ -7,12 +7,17 @@
 %define vmversion 8.0.3
 %define devoversion 495
 
-
+# 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_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)
-
-%{!?emacs_version %define emacs_version 21.4}
+%endif
 
 %define pkgdir %{emacs_lispdir}/vm
 %define pixmapdir %{pkgdir}/pixmaps
@@ -34,7 +39,7 @@
 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-el texinfo texinfo-tex
 
 %description
 VM (View Mail) is an Emacs subsystem that allows UNIX mail to be read
@@ -133,6 +138,7 @@
 * Sat Sep  8 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.0.3.495-4
 - Update for agreement with packaging guidelines - add versioned
   emacs requirement
+- If no pkg-config is found, revert to sensible defaults
 
 * 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