rpms/emacs-auctex/F-8 emacs-auctex.spec,1.24,1.25 sources,1.6,1.7
Jonathan G. Underwood (jgu)
fedora-extras-commits at redhat.com
Sat Feb 16 21:34:16 UTC 2008
Author: jgu
Update of /cvs/extras/rpms/emacs-auctex/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25270
Modified Files:
emacs-auctex.spec sources
Log Message:
* Sat Feb 16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.85-1
- Update specfile to conform to Emacs add-on packaging guidelines
- Update to version 11.85
- Update license tag to GPLv3+ accordingly
- Remove Ghostscript requires for tetex-preview package
- Spec file clean-ups
Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/F-8/emacs-auctex.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- emacs-auctex.spec 4 Aug 2007 22:33:26 -0000 1.24
+++ emacs-auctex.spec 16 Feb 2008 21:33:34 -0000 1.25
@@ -1,20 +1,45 @@
+# 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
+# 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
+# already includes preview.sty and so this may not be desireable -- setting the
+# following value to 0 means that preview-latex/AucTeX will use a privately
+# installed copy of preview.sty.
+%define separate_preview 1
+
Summary: Enhanced TeX modes for Emacs
Name: emacs-auctex
-Version: 11.84
-Release: 3%{?dist}
-License: GPLv2+
+Version: 11.85
+Release: 1%{?dist}
+License: GPLv3+
Group: Applications/Editors
URL: http://www.gnu.org/software/auctex/
-Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: auctex
Provides: auctex
Conflicts: emacspeak < 18
-Requires: emacs emacs-common ghostscript
+Requires: emacs(bin) >= %{emacs_ver}
+Requires: ghostscript
Requires: tetex-preview = %{version}-%{release}
Requires: /sbin/install-info
-BuildRequires: emacs tetex-latex texinfo-tex ghostscript
+
+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 tetex-latex texinfo-tex ghostscript
%description
AUCTeX is an extensible package that supports writing and formatting
@@ -50,10 +75,11 @@
Documentation for the AUCTeX package for emacs in various formats,
including HTML and PDF.
+%if %{separate_preview}
%package -n tetex-preview
Summary: Preview style files for LaTeX
Group: Applications/Publishing
-Requires: tetex-latex tetex-fonts ghostscript
+Requires: tetex-latex tetex-fonts
%description -n tetex-preview
The preview package for LaTeX allows for the processing of selected
@@ -74,12 +100,18 @@
The tetex-preview package is generated from the AUCTeX package for
Emacs.
+%endif
%prep
%setup -q -n auctex-%{version}
%build
+%if %{separate_preview}
%configure --with-emacs
+%else
+%configure --with-emacs --without-texmf-dir
+%endif
+
make
# Build documentation in various formats
@@ -87,30 +119,19 @@
make extradist
popd
+# Fix some encodings
+iconv -f ISO-8859-1 -t UTF8 RELEASE > RELEASE.utf8 && touch -r RELEASE RELEASE.utf8 && mv RELEASE.utf8 RELEASE
+
%install
rm -rf %{buildroot}
-
-%define startupdir %{_datadir}/emacs/site-lisp/site-start.d
-%define startupfile %{startupdir}/auctex-init.el
-
-mkdir -p %{buildroot}%{startupdir}
-
+mkdir -p %{buildroot}%{emacs_startdir}
make DESTDIR=%{buildroot} install
-
-# Startup file.
-cat <<EOF > %{buildroot}%{startupfile}
-;; This enables AUCTeX globally.
-;; See (info "(auctex)Introduction") on how to disable AUCTeX.
-;; Created for %{name}-%{version}-%{release}.noarch.rpm
-(load "auctex.el" nil t t)
-
-;; This enables preview-latex globally.
-;; Created for %{name}-%{version}-%{release}.noarch.rpm
-(load "preview-latex.el" nil t t)
-EOF
-
rm -rf %{buildroot}%{_var}
+# Remove /usr/share/doc/auctex directory from buildroot since we don't want doc
+# files installed here
+rm -rf %{buildroot}%{_docdir}/auctex
+
%clean
rm -rf %{buildroot}
@@ -124,18 +145,20 @@
/sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || :
fi
+%if %{separate_preview}
%post -n tetex-preview
/usr/bin/texhash > /dev/null 2>&1 || :
%postun -n tetex-preview
/usr/bin/texhash > /dev/null 2>&1 || :
+%endif
%files
%defattr(-,root,root,-)
%doc RELEASE COPYING README TODO FAQ CHANGES
%doc %{_infodir}/*.info*
%exclude %{_infodir}/dir
-%{startupdir}
+%{emacs_startdir}/*
%dir %{_datadir}/emacs/site-lisp/auctex
%dir %{_datadir}/emacs/site-lisp/auctex/style
%{_datadir}/emacs/site-lisp/auctex/*.elc
@@ -149,17 +172,26 @@
%doc doc/*.{dvi,ps,pdf}
%doc doc/html
-%files -n tetex-preview
-%defattr(-,root,root,-)
-%{_datadir}/texmf/tex/latex/preview
-%{_datadir}/texmf/doc/latex/styles
-
%files el
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/auctex/*.el
%{_datadir}/emacs/site-lisp/auctex/style/*.el
+%if %{separate_preview}
+%files -n tetex-preview
+%defattr(-,root,root,-)
+%{_datadir}/texmf/tex/latex/preview
+%{_datadir}/texmf/doc/latex/styles
+%endif
+
%changelog
+* Sat Feb 16 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.85-1
+- Update specfile to conform to Emacs add-on packaging guidelines
+- Update to version 11.85
+- Update license tag to GPLv3+ accordingly
+- Remove Ghostscript requires for tetex-preview package
+- Spec file clean-ups
+
* Sat Aug 4 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.84-3
- Clarify license version
- Correct version and release requirement for the el package
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 13 Jan 2007 19:04:27 -0000 1.6
+++ sources 16 Feb 2008 21:33:34 -0000 1.7
@@ -1 +1 @@
-73970c51221524442c11cde13d0584e9 auctex-11.84.tar.gz
+597c2adbee11877fe1f9b57baf0ba165 auctex-11.85.tar.gz
More information about the fedora-extras-commits
mailing list