rpms/emacs-auctex/devel emacs-auctex.spec,1.37,1.38

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30283

Modified Files:
	emacs-auctex.spec 
Log Message:
* Sat Nov  7 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.85-10
- Update spec file to use macros defined in /etc/rpm/macros.emacs
- Fix typo in spec comments



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- emacs-auctex.spec	24 Jul 2009 22:02:56 -0000	1.37
+++ emacs-auctex.spec	7 Nov 2009 17:34:45 -0000	1.38
@@ -1,18 +1,6 @@
-# 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 %{emacs_lispdir}/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
-
 # AucTeX includes preview-latex which allows previeweing directly in the Emacs
 # buffer. This makes use of preview.sty, a LaTeX class, which is also included
-# with AucTex preview-latex can either use a privately installed copy of
+# with AucTex. preview-latex can either use a privately installed copy of
 # preview.sty, or it can use one installed in the system texmf tree. If the
 # following is set to 1, an add-on LaTeX package will be created which installs
 # into the system texmf tree, and preview-latex will use that. However, TeXLive
@@ -24,14 +12,14 @@
 Summary: 	Enhanced TeX modes for Emacs
 Name: 		emacs-auctex
 Version: 	11.85
-Release: 	9%{?dist}
+Release: 	10%{?dist}
 License: 	GPLv3+
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
 Obsoletes: 	auctex
 Provides: 	auctex
 Conflicts: 	emacspeak < 18
-Requires: 	emacs(bin) >= %{emacs_version}
+Requires: 	emacs(bin) >= %{_emacs_version}
 Requires:	ghostscript dvipng
 Requires:	tex(latex) tex(dvips)
 Requires(pre): 	/sbin/install-info 
@@ -43,7 +31,7 @@ Requires: 	tex-preview = %{version}-%{re
 Source0: 	ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz
 BuildArch: 	noarch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: 	emacs emacs-el texlive-latex texinfo-tex ghostscript
+BuildRequires: 	emacs texlive-latex texinfo-tex ghostscript
 
 %description 
 AUCTeX is an extensible package that supports writing and formatting
@@ -130,7 +118,7 @@ iconv -f ISO-8859-1 -t UTF8 RELEASE > RE
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{emacs_startdir}
+mkdir -p %{buildroot}%{_emacs_sitestartdir}
 make DESTDIR=%{buildroot} install
 rm -rf %{buildroot}%{_var}
 
@@ -164,24 +152,24 @@ fi
 %doc RELEASE COPYING README TODO FAQ CHANGES
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
-%{emacs_startdir}/*
-%dir %{emacs_lispdir}/auctex
-%dir %{emacs_lispdir}/auctex/style
-%{emacs_lispdir}/auctex/*.elc
-%{emacs_lispdir}/auctex/style/*.elc
-%{emacs_lispdir}/auctex/.nosearch
-%{emacs_lispdir}/auctex/style/.nosearch
-%{emacs_lispdir}/auctex/images
-%{emacs_lispdir}/tex-site.el
+%{_emacs_sitestartdir}/*
+%dir %{_emacs_sitelispdir}/auctex
+%dir %{_emacs_sitelispdir}/auctex/style
+%{_emacs_sitelispdir}/auctex/*.elc
+%{_emacs_sitelispdir}/auctex/style/*.elc
+%{_emacs_sitelispdir}/auctex/.nosearch
+%{_emacs_sitelispdir}/auctex/style/.nosearch
+%{_emacs_sitelispdir}/auctex/images
+%{_emacs_sitelispdir}/tex-site.el
 %if !%{separate_preview}
-%{emacs_lispdir}/auctex/latex
-%{emacs_lispdir}/auctex/doc
+%{_emacs_sitelispdir}/auctex/latex
+%{_emacs_sitelispdir}/auctex/doc
 %endif
 
 %files el
 %defattr(-,root,root,-)
-%{emacs_lispdir}/auctex/*.el
-%{emacs_lispdir}/auctex/style/*.el
+%{_emacs_sitelispdir}/auctex/*.el
+%{_emacs_sitelispdir}/auctex/style/*.el
 
 %if %{separate_preview}
 %files -n tex-preview
@@ -195,6 +183,10 @@ fi
 %doc doc/html
 
 %changelog
+* Sat Nov  7 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.85-10
+- Update spec file to use macros defined in /etc/rpm/macros.emacs
+- Fix typo in spec comments
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.85-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild