rpms/emacs-bbdb/devel emacs-bbdb.spec,1.6,1.7

[Jonathan G. Underwood]

Author: jgu

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

Modified Files:
	emacs-bbdb.spec 
Log Message:
* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-4
- Update spec file to use macros installed with the emacs package rather than
  pkgconfig stuff
- Remove BuildRoot and rm -rf buildroot from install section



Index: emacs-bbdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-bbdb/devel/emacs-bbdb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- emacs-bbdb.spec	24 Jul 2009 22:03:10 -0000	1.6
+++ emacs-bbdb.spec	26 Dec 2009 15:58:22 -0000	1.7
@@ -1,15 +1,3 @@
-# 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
-
 # Note on building bbdb with support for VM: 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
@@ -19,19 +7,19 @@
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define vmsupport 1
 
-%define lispdir %{emacs_lispdir}/bbdb
+%define lispdir %{_emacs_sitelispdir}/bbdb
 %define texdir %{_datadir}/texmf/tex/generic/bbdb
 	
 
 Name:           emacs-bbdb
 Version:        2.35
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:		1
 Summary:        A contact management utility for use with Emacs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bbdb.sourceforge.net/
-Requires:       emacs(bin) >= %{emacs_version}
+Requires:       emacs(bin) >= %{_emacs_version}
 
 Source0:        bbdb-2.35.tar.gz
 
@@ -40,8 +28,7 @@ Source0:        bbdb-2.35.tar.gz
 Patch0:		bbdb-2.35-fix_lisp_makefile.patch
 
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  emacs emacs-el texinfo-tex
+BuildRequires:  emacs texinfo-tex
 
 %if %{vmsupport}
 BuildRequires:  emacs-vm-el
@@ -87,7 +74,7 @@ done
 # Note --enable-developer simply gives more verbose output during building,
 # handy for debugging
 %if %{vmsupport}
-%configure --with-vm-dir=%{emacs_lispdir}/vm --enable-developer
+%configure --with-vm-dir=%{_emacs_sitelispdir}/vm --enable-developer
 %else
 %configure --enable-developer
 %endif
@@ -96,8 +83,6 @@ done
 make all
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # There is no usable install make rule - install by hand.
 install -d $RPM_BUILD_ROOT%{lispdir}
 install -p -m 0644 lisp/*.{elc,el} $RPM_BUILD_ROOT%{lispdir}
@@ -107,8 +92,8 @@ install -d $RPM_BUILD_ROOT%{_infodir}
 install -p -m 0644 texinfo/bbdb.info $RPM_BUILD_ROOT%{_infodir}
 
 # Create and install init file
-install -d $RPM_BUILD_ROOT%{emacs_startdir}
-cat > $RPM_BUILD_ROOT%{emacs_startdir}/bbdb-mode-init.el << EOF
+install -d $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+cat > $RPM_BUILD_ROOT%{_emacs_sitestartdir}/bbdb-mode-init.el << EOF
 (require 'bbdb-autoloads)
 EOF
 
@@ -138,7 +123,7 @@ fi
 %doc %{_infodir}/bbdb.info.gz
 %{lispdir}/*.elc
 %{texdir}/*.tex
-%{emacs_startdir}/bbdb-mode-init.el
+%{_emacs_sitestartdir}/bbdb-mode-init.el
 %dir %{lispdir}
 
 %files el 
@@ -146,6 +131,11 @@ fi
 %{lispdir}/*.el
 
 %changelog
+* Sat Dec 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-4
+- Update spec file to use macros installed with the emacs package rather than
+  pkgconfig stuff
+- Remove BuildRoot and rm -rf buildroot from install section
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.35-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild