- Spec file fixes for Emacs add-on guideline compliance

- Move *.el(c) files to their own directory
- Use Emacs packaging macros
- Remove unneeded pkgconfig macros

a2ps.spec

@@ -1,19 +1,7 @@
-# emacs packaging macros
-%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
-
-
 Summary: Converts text and other types of files to PostScript
 Name: a2ps
 Version: 4.14
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Source0: http://ftp.gnu.org/gnu/a2ps/%{name}-%{version}.tar.gz
@@ -43,7 +31,7 @@ Patch34: a2ps-external-libtool.patch
 Patch35: a2ps-4.14-texinfo-nodes.patch
 Requires: fileutils sh-utils info
 BuildRequires: gperf
-BuildRequires: emacs, emacs-el, flex, libtool, texinfo, groff
+BuildRequires: emacs, flex, libtool, texinfo, groff
 BuildRequires: ImageMagick
 BuildRequires: groff-perl
 BuildRequires: cups
@@ -68,7 +56,7 @@ Provides: a2ps-i18n = 0.1-2
 %package -n emacs-%{name}
 Summary: Emacs bindings for a2ps files
 Group: Applications/Editors
-Requires: emacs(bin) >= %{emacs_version}
+Requires: emacs(bin) >= %{_emacs_version}
 
 
 %package -n emacs-%{name}-el
@@ -185,7 +173,8 @@ mv etc/README.in.tmp etc/README.in
 
 EMACS=emacs %configure \
   --with-medium=_glibc \
-  --enable-kanji
+  --enable-kanji \
+  --with-lispdir=%{_emacs_sitelispdir}/%{name}
 
 # Remove prebuilt info files to force regeneration at build time
 find . -name "*.info*" -exec rm -f {} \;
@@ -281,13 +270,20 @@ exit 0
 
 %files -n emacs-%{name}
 %defattr(-,root,root,-)
-%{emacs_lispdir}/*.elc
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.elc
 
 %files -n emacs-%{name}-el
 %defattr(-,root,root,-)
-%{emacs_lispdir}/*.el
+%{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Sun Mar 14 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 4.14-11
+- Spec file fixes for Emacs add-on guideline compliance
+- Move *.el(c) files to their own directory
+- Use Emacs packaging macros
+- Remove unneeded pkgconfig macros
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.14-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild