rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.12,1.13

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/emacs-auctex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11613

Modified Files:
	emacs-auctex.spec 
Log Message:
Revert to building a tetex-preview subpackage now that bugs 193069 and
189753 have been resolved. Also see bug 192960. In order to override
Obsolotes/Provides tetex-preview of previous releases main package,
and also to ensure that the latest tetex-latex packages are installed,
have used strict Requires %version-%release.

Various other small spec file cleanups.



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- emacs-auctex.spec	24 May 2006 20:43:30 -0000	1.12
+++ emacs-auctex.spec	9 Jun 2006 00:09:48 -0000	1.13
@@ -1,47 +1,85 @@
-%define startupdir   %{_datadir}/emacs/site-lisp/site-start.d/
-%define startupfile  %{startupdir}/auctex-init.el
+%define startupdir %{_datadir}/emacs/site-lisp/site-start.d/
+%define startupfile %{startupdir}/auctex-init.el
+
+%define textree %{_datadir}/texmf/tex/
+%define previewdir %{textree}/latex/preview/
 
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	11%{?dist}
+Release: 	12%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
-Source0:        ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz
-BuildArch:      noarch
+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
-Conflicts:      emacspeak < 18
-Provides:       auctex
-Requires:       emacs emacs-common ghostscript 
-Requires: 	tetex tetex-latex tetex-dvips tetex-xdvi 
-BuildRequires:  emacs tetex tetex-latex tetex-dvips texinfo ghostscript
-
-# To deal with nasty bug 192960, don't export tetex-latex sub-package, and:
-Obsoletes:	tetex-preview
-Provides:	tetex-preview
+Obsoletes: 	auctex
+Provides: 	auctex
+Conflicts: 	emacspeak < 18
+Requires: 	emacs emacs-common ghostscript 
+Requires: 	tetex-preview = %{version}-%{release}
+Requires: 	/sbin/install-info
+BuildRequires: 	emacs tetex-latex texinfo ghostscript
 
 %description 
-AUCTeX is an extensible package that supports writing and formatting
-TeX files for most variants of Emacs.
+AUCTeX is an extensible package that supports writing and formatting TeX files
+for most variants of Emacs.
 
-AUCTeX supports many different TeX macro packages, including AMS-TeX,
-LaTeX, Texinfo and basic support for ConTeXt.  Documentation can be
-found under /usr/share/doc, e.g. the reference card (tex-ref.pdf) and
-the FAQ.  The AUCTeX manual is available in Emacs info (C-h i d m
-AUCTeX RET).  On the AUCTeX home page, we provide manuals in various
-formats.
+AUCTeX supports many different TeX macro packages, including AMS-TeX, LaTeX,
+Texinfo and basic support for ConTeXt.  Documentation can be found under
+/usr/share/doc, e.g. the reference card (tex-ref.pdf) and the FAQ. The AUCTeX
+manual is available in Emacs info (C-h i d m AUCTeX RET). On the AUCTeX home
+page, we provide manuals in various formats.
+
+AUCTeX includes preview-latex support which makes LaTeX a tightly integrated
+component of your editing workflow by visualizing selected source chunks (such
+as single formulas or graphics) directly as images in the source buffer.
 
 This package is for GNU Emacs.
 
+%package el
+Summary: 	Elisp source files for %{name}
+Group: 		Applications/Editors
+Requires: 	%{name} = %{version}-%{release}
+
+%description el
+This package contains the source Elisp files for AUCTeX for Emacs.
+
+%package -n tetex-preview
+Summary: 	Preview style files for LaTeX
+Group: 		Applications/Publishing
+Requires: 	tetex-latex >= 3.0-10
+Requires:	tetex-fonts >= 3.0-10 
+Requires:	ghostscript
+
+%description -n tetex-preview 
+The preview package for LaTeX allows for the processing of selected parts of a
+LaTeX input file.  This package extracts indicated pieces from a source file
+(typically displayed equations, figures and graphics) and typesets with their
+base point at the (1in,1in) magic location, shipping out the individual pieces
+on separate pages without any page markup.  You can produce either DVI or PDF
+files, and options exist that will set the page size separately for each page.
+In that manner, further processing (as with Ghostscript or dvipng) will be able
+to work in a single pass.
+
+The main purpose of this package is the extraction of certain environments (most
+notably displayed formulas) from La TeX sources as graphics. This works with DVI
+files postprocessed by either Dvips and Ghostscript or dvipng, but it also works
+when you are using PDFTeX for generating PDF files (usually also postprocessed
+by Ghostscript).
+
+The tetex-preview package is generated from the AUCTeX package for Emacs.
+
 %prep
 %setup -q -n auctex-%{version}
 
 %build
-mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/preview
+mkdir -p %{buildroot}%{previewdir}
 
-%configure --with-emacs --without-texmf-dir
+%configure --with-emacs \
+	--with-texmf-dir=%{buildroot}%{textree} \
+	--with-tex-dir=%{buildroot}%{previewdir}
 
 make
 
@@ -51,11 +89,11 @@
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}{%{_datadir}/emacs/site-lisp/site-start.d,%{_infodir}}
-%makeinstall
 
 mkdir -p %{buildroot}%{startupdir}
+%makeinstall
 
+# Startup file.
 cat <<EOF > %{buildroot}%{startupfile}
 ;; This enables AUCTeX globally.
 ;; See (info "(auctex)Introduction") on how to disable AUCTeX.
@@ -82,6 +120,12 @@
   /sbin/install-info --delete %{_infodir}/preview-latex.info %{_infodir}/dir 2>/dev/null || :
 fi
 
+%post -n tetex-preview
+/usr/bin/texhash > /dev/null 2>&1 || :
+
+%postun -n tetex-preview
+/usr/bin/texhash > /dev/null 2>&1 || :
+
 %files
 %defattr(-,root,root,-)
 %doc RELEASE COPYING README TODO FAQ CHANGES
@@ -89,13 +133,34 @@
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
 %{startupdir}
-%{_datadir}/emacs/site-lisp/auctex
+%{_datadir}/emacs/site-lisp/auctex/*.elc
+%{_datadir}/emacs/site-lisp/auctex/style/*.elc
+%{_datadir}/emacs/site-lisp/auctex/.nosearch
+%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
+%{_datadir}/emacs/site-lisp/auctex/images
 %{_datadir}/emacs/site-lisp/tex-site.el
 
+%files -n tetex-preview
+%defattr(-,root,root,-)
+%{previewdir}
+%{textree}/doc/latex/styles/preview.dvi
+
+%files el
+%defattr(-,root,root,-)
+%{_datadir}/emacs/site-lisp/auctex/*.el
+%{_datadir}/emacs/site-lisp/auctex/style/*.el
+
 %changelog
+* Fri Jun  8 2006 Jonathan Underwood <jonathan.underwood at gmail.com> - 11.82-12
+- Move back to building a tetex-preview subpackage now that bugs 193069 and
+  189753 have been resolved for FC-4
+- Add strict version-release dependencies so that packaging collisions mentioned
+  in these bugs are avoided, and alos to override the Provides/Obsoletes of the
+  previous release (11.82-11)
+
 * Wed May 24 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.82-11
-- Revert change to create tetex-preview subpackage
-- Main package obsolotes and Provides tetex-preview
+- Revert change to create tetex-preview subpackage - see bug 192960
+- Main package Obsolotes and Provides tetex-preview
 
 * Thu May 18 2006 Jonathan Underwood <jonathan.underwood at gmail.com> - 11.82-9
 - Split out tetex-preview subpackage