rpms/texlive/devel texlive-mktexlsr_fixes.patch, 1.1, 1.2 texlive.spec, 1.12, 1.13
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Mon Jan 7 09:35:13 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/texlive/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31822
Modified Files:
texlive-mktexlsr_fixes.patch texlive.spec
Log Message:
- add tex-latex and tex-dvips virtual provides
- mktexlsr fixes from Patrice Dumas
texlive-mktexlsr_fixes.patch:
Index: texlive-mktexlsr_fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive-mktexlsr_fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- texlive-mktexlsr_fixes.patch 2 Dec 2007 08:03:19 -0000 1.1
+++ texlive-mktexlsr_fixes.patch 7 Jan 2008 09:34:59 -0000 1.2
@@ -1,18 +1,23 @@
-## 10_mktexlsr_fixes by <frank at debian.org> etc etc
-##
-## DP: Fixes wrong paths in various scripts to make lintian shut up.
-## DP: Fix creation of ls-R in root's homedir
-## DP: Also add a note to the man page of mktexlsr about the above fix
-
- build/source/texk/kpathsea/mktexlsr | 24 ++++++++++++------------
- texmf/doc/man/man1/mktexlsr.1 | 9 +++++++++
- 2 files changed, 21 insertions(+), 12 deletions(-)
-
-Index: texlive-bin-2006.svn3816/build/source/texk/kpathsea/mktexlsr
-===================================================================
---- texlive-bin-2006.svn3816.orig/build/source/texk/kpathsea/mktexlsr 2006-12-25 19:44:43.000000000 +0100
-+++ texlive-bin-2006.svn3816/build/source/texk/kpathsea/mktexlsr 2007-01-26 03:55:05.000000000 +0100
-@@ -82,6 +82,9 @@
+diff -up texlive-2007/texk/kpathsea/mktexlsr.man.mktexlsr_fixes texlive-2007/texk/kpathsea/mktexlsr.man
+--- texlive-2007/texk/kpathsea/mktexlsr.man.mktexlsr_fixes 2006-01-17 22:41:51.000000000 +0100
++++ texlive-2007/texk/kpathsea/mktexlsr.man 2008-01-06 16:13:33.000000000 +0100
+@@ -44,3 +44,12 @@ Print help message and exit.
+ .B --version
+ .rb
+ Print version information and exit.
++.\"=====================================================================
++.SH NOTES
++When called by root with no arguments, \fBmktexlsr\fP in Debian ignores
++TEXMF trees under \fI$HOME\fP. This is to avoid creating undesirable files
++such as \fI/root/texmf/ls-R\fP when doing usual maintainance (it is generally
++a bad idea to work with TeX as root, therefore having a file such as
++\fI/root/texmf/ls-R\fP in the first place is rather pointless). If you really
++want to update the ls-R databases for such TEXMF trees, simply list them
++explicitely on the command-line.
+diff -up texlive-2007/texk/kpathsea/mktexlsr.mktexlsr_fixes texlive-2007/texk/kpathsea/mktexlsr
+--- texlive-2007/texk/kpathsea/mktexlsr.mktexlsr_fixes 2006-12-25 19:44:43.000000000 +0100
++++ texlive-2007/texk/kpathsea/mktexlsr 2008-01-06 16:37:22.000000000 +0100
+@@ -82,10 +82,21 @@ test $# = 0 && {
'
set x `kpsewhich --show-path=ls-R | tr : '
' | sort | uniq`; shift
@@ -22,18 +27,19 @@
IFS=$OIFS
}
-@@ -89,6 +92,10 @@
- # Prepend cwd if the directory was relative.
- case "$TEXMFLS_R" in
- "") continue ;; # Strictly speaking, it is an error if this case is taken.
-+ $HOME/*) if test -n "$NOROOTHOME"; then
+ for TEXMFLS_R in "$@"; do
++ if [ "z$HOME" != 'z' ]; then
++ case "$TEXMFLS_R" in
++ $HOME/*) if test -n "$NOROOTHOME"; then
+ tty -s && echo "$progname: Skipping $TEXMFLS_R" >&2
+ continue
+ fi ;;
- /* | [A-z]:/*) ;;
- *) TEXMFLS_R="`pwd`/$TEXMFLS_R"
- esac
-@@ -112,9 +119,9 @@
++ esac
++ fi
+ # Prepend cwd if the directory was relative.
+ case "$TEXMFLS_R" in
+ "") continue ;; # Strictly speaking, it is an error if this case is taken.
+@@ -112,9 +123,9 @@ for TEXMFLS_R in "$@"; do
db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
test -d "$db_dir" || continue
@@ -44,7 +50,7 @@
cp /dev/null "$db_file"
# Use same permissions as parent directory, minus x,s, or t bits.
chmod `kpsestat -xst "$db_dir"` "$db_file"
-@@ -128,11 +135,8 @@
+@@ -128,11 +139,8 @@ for TEXMFLS_R in "$@"; do
# Skip if we cannot write the file:
kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission. Skipping..." >&2; continue; }
@@ -58,7 +64,7 @@
$verbose && echo "$progname: Updating $db_file... " >&2
echo "$ls_R_magic" >"$db_file_tmp"
-@@ -152,12 +156,8 @@
+@@ -152,12 +160,8 @@ for TEXMFLS_R in "$@"; do
| sed -e '/\.svn.*:$/,/^$/d' \
>>"$db_file_tmp"
@@ -73,21 +79,3 @@
done
$verbose && echo "$progname: Done." >&2
exit 0
-Index: texlive-bin-2006.svn3816/texmf/doc/man/man1/mktexlsr.1
-===================================================================
---- texlive-bin-2006.svn3816.orig/build/source/texk/kpathsea/mktexlsr.man 2007-01-14 19:01:06.000000000 +0100
-+++ texlive-bin-2006.svn3816/build/source/texk/kpathsea/mktexlsr.man 2007-01-26 03:55:05.000000000 +0100
-@@ -44,3 +44,12 @@
- .B --version
- .rb
- Print version information and exit.
-+.\"=====================================================================
-+.SH NOTES
-+When called by root with no arguments, \fBmktexlsr\fP in Debian ignores
-+TEXMF trees under \fI$HOME\fP. This is to avoid creating undesirable files
-+such as \fI/root/texmf/ls-R\fP when doing usual maintainance (it is generally
-+a bad idea to work with TeX as root, therefore having a file such as
-+\fI/root/texmf/ls-R\fP in the first place is rather pointless). If you really
-+want to update the ls-R databases for such TEXMF trees, simply list them
-+explicitely on the command-line.
-
Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- texlive.spec 4 Jan 2008 13:24:51 -0000 1.12
+++ texlive.spec 7 Jan 2008 09:34:59 -0000 1.13
@@ -27,7 +27,7 @@
Name: texlive
Version: %{texlive_ver}
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Binaries for the TeX formatting system
Group: Applications/Publishing
@@ -180,7 +180,7 @@
Obsoletes: tetex-fonts < 3.0-99
Provides: tetex-fonts = 3.0-99
Obsoletes: texlive-fonts < 2007-6
-Provides: texlive-fonts = 2007-6
+Provides: texlive-fonts = %{version}-%{release}
%description
TeXLive is an implementation of TeX for Linux or UNIX systems. TeX takes
@@ -228,7 +228,7 @@
Provides: tetex-dvips = 3.0-99
Requires: texlive-texmf-dvips = %{version}
Requires: texlive-texmf-errata = %{version}
-
+Provides: tex-dvips
%description dvips
Dvips converts .dvi files, for example those produced by the TeX text
@@ -266,6 +266,7 @@
Provides: tetex-latex = 3.0-99
Requires: texlive-texmf-latex = %{version}
Requires: texlive-texmf-errata = %{version}
+Provides: tex-latex
%description latex
LaTeX is a front end for the TeX text formatting system. Easier to
@@ -432,7 +433,7 @@
%patch43 -p1 -b .perl
%patch100 -p3
-%patch101 -p3
+%patch101 -p1 -b .mktexlsr_fixes
%patch102 -p3
%patch104 -p3
%patch105 -p3
@@ -1329,6 +1330,10 @@
%{_texmf_main}/dvipdfm/
%changelog
+* Mon Jan 07 2008 Jindrich Novy <jnovy at redhat.com> - 2007-8
+- add tex-latex and tex-dvips virtual provides
+- mktexlsr fixes from Patrice Dumas
+
* Fri Jan 04 2008 Jindrich Novy <jnovy at redhat.com> - 2007-7
- add tetex-fonts virtual provides to main texlive package (#427521)
More information about the fedora-extras-commits
mailing list