From 39ed6db06b91da3fbce4d15dfdb786bed9b256f1 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 22 Jan 2008 11:45:26 +0000 Subject: [PATCH] - use xdg-open(1) in texdoctk (#429659) - fix bad syntax of texmfstart man page --- texlive-man-context.patch | 14 ++++++++++++++ texlive-texdoc.patch | 25 +++++++++++++++---------- texlive.spec | 8 +++++++- 3 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 texlive-man-context.patch diff --git a/texlive-man-context.patch b/texlive-man-context.patch new file mode 100644 index 0000000..71b1ac2 --- /dev/null +++ b/texlive-man-context.patch @@ -0,0 +1,14 @@ +diff -up texlive-2007/texk/tetex/context/texmfstart.man.man-context texlive-2007/texk/tetex/context/texmfstart.man +--- texlive-2007/texk/tetex/context/texmfstart.man.man-context 2007-01-19 04:53:28.000000000 +0100 ++++ texlive-2007/texk/tetex/context/texmfstart.man 2008-01-22 12:15:12.000000000 +0100 +@@ -21,8 +21,8 @@ texmfstart \- run ConTeXt scripts, make + \fB texmfstart\fP [ \fIoptions ...\fP ] [ \fIfilename\fP ] [ \fIarguments ...\fP ] + + .SH "DESCRIPTION" +-ConTeXt is a typesetting system based on +-the .BR tex (1) ++ConTeXt is a typesetting system based on the ++.BR tex (1) + family of programs. + .B texmfstart + is a ConTeXt meta-script that can run subordinate diff --git a/texlive-texdoc.patch b/texlive-texdoc.patch index 8df8d88..6d39671 100644 --- a/texlive-texdoc.patch +++ b/texlive-texdoc.patch @@ -1,7 +1,7 @@ diff -up texlive-2007/texk/tetex/texdoc.man.texdoc texlive-2007/texk/tetex/texdoc.man ---- texlive-2007/texk/tetex/texdoc.man.texdoc 2006-01-17 22:41:51.000000000 +0100 -+++ texlive-2007/texk/tetex/texdoc.man 2007-08-18 19:13:50.000000000 +0200 -@@ -28,12 +28,17 @@ distribution\&. +--- texlive-2007/texk/tetex/texdoc.man.texdoc 2008-01-22 09:34:54.000000000 +0100 ++++ texlive-2007/texk/tetex/texdoc.man 2008-01-22 09:37:03.000000000 +0100 +@@ -28,28 +28,37 @@ distribution\&. .PP .SH "OPTIONS" .PP @@ -22,9 +22,12 @@ diff -up texlive-2007/texk/tetex/texdoc.man.texdoc texlive-2007/texk/tetex/texdo Sets verbose mode\&. Shows the command being used to display the documentation\&. .PP -@@ -42,14 +47,17 @@ display the documentation\&. + .SH "ENVIRONMENT" + .PP .IP "\fB$TEXDOCVIEW_dvi\fP" - DVI viewer\&. Defaults to \fBxdvi\fP(1)\&. +-DVI viewer\&. Defaults to \fBxdvi\fP(1)\&. ++DVI viewer\&. The default is to use the program specified ++by the freedesktop standard\&. .IP "\fB$TEXDOCVIEW_pdf\fP" -PDF viewer\&. Defaults to \fBacroread\fP(1)\&. +PDF viewer\&. The default is to use the program specified @@ -45,7 +48,7 @@ diff -up texlive-2007/texk/tetex/texdoc.man.texdoc texlive-2007/texk/tetex/texdo .PP The environment variables should be set with a ``%s\&'\&' as a placeholder for the name of the file\&. For example, -@@ -66,10 +74,18 @@ hostname$ TEXDOCVIEW_html="mozilla %s" +@@ -66,10 +75,18 @@ hostname$ TEXDOCVIEW_html="mozilla %s" hostname$ export TEXDOCVIEW_html .EE .PP @@ -62,13 +65,13 @@ diff -up texlive-2007/texk/tetex/texdoc.man.texdoc texlive-2007/texk/tetex/texdo .PP -\fBacroread\fP(1), \fBgv\fP(1), \fBkpsewhich\fP(1), -\fBless\fP(1), \fBmore\fP(1), \fBxdvi\fP(1) -+\fBxdg-open\fP(1), \fBxdvi\fP(1) ++\fBxdg-open\fP(1) .PP Web page: .PP diff -up texlive-2007/texk/tetex/texdoc.texdoc texlive-2007/texk/tetex/texdoc --- texlive-2007/texk/tetex/texdoc.texdoc 2006-01-17 22:41:51.000000000 +0100 -+++ texlive-2007/texk/tetex/texdoc 2007-08-18 19:10:51.000000000 +0200 ++++ texlive-2007/texk/tetex/texdoc 2008-01-22 09:39:17.000000000 +0100 @@ -17,6 +17,15 @@ # # Support for compressed documentation implemented by adopting changes @@ -148,16 +151,18 @@ diff -up texlive-2007/texk/tetex/texdoc.texdoc texlive-2007/texk/tetex/texdoc } -@@ -92,12 +107,11 @@ case `(uname -s) 2>/dev/null` in +@@ -91,13 +106,12 @@ case `(uname -s) 2>/dev/null` in + extlist='.pdf .ps .txt .dvi .html' ;; *) - : ${TEXDOCVIEW_dvi='(xdvi %s) &'} +- : ${TEXDOCVIEW_dvi='(xdvi %s) &'} - : ${TEXDOCVIEW_pdf='(acroread %s) &'} - : ${TEXDOCVIEW_ps='(gv %s) &'} - : ${TEXDOCVIEW_html='mozilla -remote openURL'"'(%s)'"' 2>/dev/null || mozilla %s &'} - : ${TEXDOCVIEW_txt="${PAGER-more} %s"} - : ${TEXDOCVIEW_="${PAGER-more} %s"} # no extension, default to pager - extlist='.dvi .dvi.gz .dvi.bz2 .pdf .pdf.gz .pdf.bz2 .ps .ps.gz .ps.bz2 .txt .txt.gz .txt.bz2 .html' ++ : ${TEXDOCVIEW_dvi='(xdg-open %s) &'} + : ${TEXDOCVIEW_pdf='(xdg-open %s) &'} + : ${TEXDOCVIEW_ps='(xdg-open %s) &'} + : ${TEXDOCVIEW_html='(xdg-open %s) &'} diff --git a/texlive.spec b/texlive.spec index 8f22db9..55892db 100644 --- a/texlive.spec +++ b/texlive.spec @@ -26,7 +26,7 @@ Name: texlive Version: %{texlive_ver} -Release: 13%{?dist} +Release: 14%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -78,6 +78,7 @@ Patch25: texlive-dvipsoverflow.patch Patch26: texlive-dviljktemp.patch Patch27: texlive-poppler.patch Patch28: texlive-man-notetex.patch +Patch29: texlive-man-context.patch ###### # mpeters contributed patches @@ -390,6 +391,7 @@ chmod -x texk/dvipdfm/encodings.c %patch26 -p1 -b .dviljktemp %patch27 -p1 -b .poppler %patch28 -p1 -b .notetex +%patch29 -p1 -b .man-context # fix non utf man pages %patch41 -p1 -b .notutf8 @@ -1184,6 +1186,10 @@ fi %{_texmf_main}/dvipdfm/ %changelog +* Tue Jan 22 2008 Jindrich Novy - 2007-14 +- use xdg-open(1) in texdoctk (#429659) +- fix bad syntax of texmfstart man page + * Fri Jan 18 2008 Jindrich Novy - 2007-13 - don't copy original pdftex map files but regenerate them with the correct updmap.cfg file updated in texlive-texmf