rpms/emacs-auctex/F-12 emacs-auctex-11.85-fileview.patch, NONE, 1.1 emacs-auctex.spec, 1.37, 1.38
Jonathan G. Underwood
jgu at fedoraproject.org
Thu Jan 28 14:14:07 UTC 2010
Author: jgu
Update of /cvs/pkgs/rpms/emacs-auctex/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22130
Modified Files:
emacs-auctex.spec
Added Files:
emacs-auctex-11.85-fileview.patch
Log Message:
* Thu Jan 28 2010 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.85-10
- Add patch to use evince for PDF file viewing and xdg-open for html file
viewing
- Add Requires for evince
- Update spec file to use macros defined in /etc/rpm/macros.emacs
- Fix typo in spec comments
emacs-auctex-11.85-fileview.patch:
tex.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE emacs-auctex-11.85-fileview.patch ---
diff -up auctex-11.85/tex.el.fileview auctex-11.85/tex.el
--- auctex-11.85/tex.el.fileview 2010-01-28 13:56:16.475726282 +0000
+++ auctex-11.85/tex.el 2010-01-28 14:01:22.986724899 +0000
@@ -446,8 +446,8 @@ is not recommended because it is more po
("^dvi$" "^legalpaper$" "%(o?)xdvi %dS -paper legal %d")
("^dvi$" "^executivepaper$" "%(o?)xdvi %dS -paper 7.25x10.5in %d")
("^dvi$" "." "%(o?)xdvi %dS %d")
- ("^pdf$" "." "xpdf -remote %s -raise %o %(outpage)")
- ("^html?$" "." "netscape %o"))
+ ("^pdf$" "." "evince --page-label=%(outpage) %o")
+ ("^html?$" "." "xdg-open %o"))
"List of output file extensions and view options.
If the first element (a regular expresion) matches the output
Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-auctex/F-12/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 28 Jan 2010 14:14:07 -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,15 +12,15 @@
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: ghostscript dvipng
+Requires: emacs(bin) >= %{_emacs_version}
+Requires: ghostscript dvipng evince
Requires: tex(latex) tex(dvips)
Requires(pre): /sbin/install-info
Requires(post): /sbin/install-info
@@ -41,9 +29,14 @@ Requires: tex-preview = %{version}-%{re
%endif
Source0: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.gz
+# Patch to change viewers for filetypes:
+# pdf: use evince instead of xpdf
+# html: use xdg-open instead of netscape
+Patch0: emacs-auctex-11.85-fileview.patch
+
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
@@ -110,6 +103,7 @@ Emacs.
%prep
%setup -q -n auctex-%{version}
+%patch0 -p1 -b .fileview
%build
%if %{separate_preview}
@@ -130,7 +124,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 +158,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 +189,13 @@ fi
%doc doc/html
%changelog
+* Thu Jan 28 2010 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 11.85-10
+- Add patch to use evince for PDF file viewing and xdg-open for html file
+ viewing
+- Add Requires for evince
+- 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
More information about the scm-commits
mailing list