Hello community, here is the log from the commit of package texlive-specs-k for openSUSE:12.3 checked in at 2013-02-26 15:26:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/texlive-specs-k (Old) and /work/SRC/openSUSE:12.3/.texlive-specs-k.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-k", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/texlive-specs-k/texlive-specs-k.changes 2013-02-07 10:52:17.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.texlive-specs-k.new/texlive-specs-k.changes 2013-02-26 15:27:05.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 26 08:48:04 UTC 2013 - werner@suse.de + +- Avoid doubling mktex.opt content with excessive patch which had + lead that the original content overrides the new one (bnc#801727) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpathsea_cnf.dif ++++++ --- /var/tmp/diff_new_pack.jymDp3/_old 2013-02-26 15:27:08.000000000 +0100 +++ /var/tmp/diff_new_pack.jymDp3/_new 2013-02-26 15:27:08.000000000 +0100 @@ -43,66 +43,35 @@ +#! musictex pdftex - -translate-file=cp227.tcx &etex musictex.ins +#! pdfmusictex pdftex - -translate-file=cp227.tcx &pdfetex pdfmusictex.ins --- texmf/web2c/mktex.opt -+++ texmf/web2c/mktex.opt 2012-05-14 13:26:00.034911495 +0200 -@@ -0,0 +1,141 @@ -+# mktex.opt -- common mktex* options, etc. -+# Meant to be sourced after $usage, $version, and $MT_TEXMFMAIN have been set. -+# -+# Originally written by Thomas Esser. Public domain. -+# $Id: mktex.opt 18383 2010-05-20 18:31:24Z karl $ -+ -+if test "x$1" = x--help || test "x$1" = x-help; then -+ echo "$usage" -+ exit 0 -+elif test "x$1" = x--version || test "x$1" = x-version; then -+ echo "`basename $0` $version" -+ kpsewhich --version -+ exit 0 -+elif test $# -lt ${mt_min_args-1}; then -+ echo "$0: Missing argument(s)." >&2 -+ echo "Try \``basename $0` --help' for more information." >&2 -+ exit 1 -+elif test $# -gt ${mt_max_args-1}; then -+ num=$# -+ while test $# -gt `expr $num - ${mt_max_args-1}`; do shift; done -+ echo "$0: Extra arguments $*." >&2 -+ echo "Try \``basename $0` --help' for more information." >&2 -+ exit 1 -+fi -+ -+# MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate -+# directories in path lists whereas Unix uses `:'. Make an exception for -+# Cygwin, which pretends to be UNIX. -+# Create a variable that holds the right character to be used by the scripts. -+DOSISH=no -+case `uname -s` in -+ CYGWIN*|Cygwin*|cygwin*) ;; -+ *) if test -n "$COMSPEC" || test -n "$ComSpec"; then DOSISH=yes; fi -+esac -+if test "$DOSISH" = "no"; then SEP=':'; else SEP=';';fi -+ -+# TEMPDIR needs to be unique to each process because of the possibility of two -+# people running dvips (or whatever) simultaneously. -+if test -n "$TMPDIR"; then ++++ texmf/web2c/mktex.opt 2013-02-25 17:27:24.873444507 +0100 +@@ -37,10 +37,11 @@ if test "$DOSISH" = "no"; then SEP=':'; + # TEMPDIR needs to be unique to each process because of the possibility of two + # people running dvips (or whatever) simultaneously. + if test -n "$TMPDIR"; then +- TEMPDIR="${TMPDIR}/mt$$.tmp" + TEMPDIR="${TMPDIR}/.mtXXXXXXXXXX" -+else + else +- TEMPDIR="/tmp/mt$$.tmp" + TEMPDIR="/tmp/.mtXXXXXXXXXX" -+fi + fi +TEMPDIR=$(mktemp -d "$TEMPDIR") || exit 1 -+ -+# We want to output only filenames to standard output, but it's too -+# error-prone to write the scripts that way, so we direct stdout here. -+STDOUT="$TEMPDIR/mt$$.out" -+ -+# We will change search paths to include $KPSE_DOT. This is necessary -+# since we cd to $TEMPDIR. + + # We want to output only filenames to standard output, but it's too + # error-prone to write the scripts that way, so we direct stdout here. +@@ -48,17 +49,23 @@ STDOUT="$TEMPDIR/mt$$.out" + + # We will change search paths to include $KPSE_DOT. This is necessary + # since we cd to $TEMPDIR. +-: ${KPSE_DOT=`pwd`}; export KPSE_DOT +: ${KPSE_DOT=${PWD}}; export KPSE_DOT -+ -+# Clean up on normal or abnormal exit. -+# The "cd /" is for MS-DOS and MS-Windows, where there is a separate -+# current directory on each drive, and therefore "cd $KPSE_DOT" might -+# still leave $TMPDIR current directory on its drive, in which case it -+# cannot be removed. + + # Clean up on normal or abnormal exit. + # The "cd /" is for MS-DOS and MS-Windows, where there is a separate + # current directory on each drive, and therefore "cd $KPSE_DOT" might + # still leave $TMPDIR current directory on its drive, in which case it + # cannot be removed. +-trap 'rc=$?; cd /; cd "$KPSE_DOT"; test -f "$STDOUT" && cat "$STDOUT"; rm -rf "$TEMPDIR"; exit $rc' \ +- 0 1 2 3 7 13 15 +atexit () +{ + local rc=$? @@ -112,61 +81,30 @@ + exit $rc +} +trap 'atexit' EXIT SIGHUP SIGINT SIGQUIT SIGBUS SIGPIPE SIGTERM -+ -+cd "$TEMPDIR" || exit 1 -+ -+# The alternative location for fonts. The directory need not exist, -+# so we use --expand-var here. We also perform a sanity check. -+: ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`} -+if test -z "$MT_VARTEXFONTS"; then -+ echo "$0: VARTEXFONTS is not defined. Defaulting to \`$KPSE_DOT'." >&2 -+ MT_VARTEXFONTS='$KPSE_DOT' -+fi + +-(umask 077 && mkdir "$TEMPDIR") || exit 1 + cd "$TEMPDIR" || exit 1 + + # The alternative location for fonts. The directory need not exist, +@@ -68,6 +75,11 @@ if test -z "$MT_VARTEXFONTS"; then + echo "$0: VARTEXFONTS is not defined. Defaulting to \`$KPSE_DOT'." >&2 + MT_VARTEXFONTS='$KPSE_DOT' + fi +: ${MT_TEXMFVAR=`kpsewhich --expand-var='$TEXMFVAR' | sed 's%^!!%%'`} +if test -z "$MT_TEXMFVAR"; then + echo "$0: TEXMFVAR is not defined. Defaulting to \`$KPSE_DOT'." >&2 + MT_TEXMFVAR='$KPSE_DOT' +fi -+ -+# The supporting scripts: -+: ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`} -+test -n "$MT_MKTEXNAM" || MT_MKTEXNAM="$MT_TEXMFMAIN/web2c/mktexnam" -+: ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`} -+test -n "$MT_MKTEXNAM_OPT" || MT_MKTEXNAM_OPT="$MT_TEXMFMAIN/web2c/mktexnam.opt" -+: ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`} -+test -n "$MT_MKTEXDIR" || MT_MKTEXDIR="$MT_TEXMFMAIN/web2c/mktexdir" -+: ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`} -+test -n "$MT_MKTEXDIR_OPT" || MT_MKTEXDIR_OPT="$MT_TEXMFMAIN/web2c/mktexdir.opt" -+: ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`} -+test -n "$MT_MKTEXUPD" || MT_MKTEXUPD="$MT_TEXMFMAIN/web2c/mktexupd" -+ -+# mktexupd and mktexlsr make sure they're coordinated via this. A copy of -+# the first string is found in mktexlsr. -+ls_R_magic='% ls-R -- filename database for kpathsea; do not change this line.' -+# Old ls-R files should continue to work. -+old_ls_R_magic='% ls-R -- maintained by MakeTeXls-R; do not change this line.' -+ -+# Read defaults from mktex.cnf if that file exists. Can be used to -+# overwrite anything defined below. Please use the same syntax as -+# given here (e.g. ``: ${MODE=ljfour}'', not just ``MODE=ljfour'', as -+# this can cause trouble (e.g. when the mode for mktexnam is -+# already specified on the command line). -+: ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`} -+test -n "$MT_MKTEX_CNF" && test -r "$MT_MKTEX_CNF" && . "$MT_MKTEX_CNF" -+ -+# Possible features: appendonlydir dosnames fontmaps nomfdrivers nomode -+# stripsupplier striptypeface texmfvar varfonts. -+if test "$DOSISH" = "yes"; then -+ : ${MT_FEATURES=appendonlydir:dosnames} -+else -+ : ${MT_FEATURES=appendonlydir} -+fi -+: ${MODE=ljfour} -+: ${BDPI=600} -+: ${DPI=600} -+: ${MAG=1.0} -+: ${ps_to_pk=gsftopk} # some prefer ps2pk -+ + + # The supporting scripts: + : ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`} +@@ -108,9 +120,18 @@ fi + : ${MAG=1.0} + : ${ps_to_pk=gsftopk} # some prefer ps2pk + +-# Allow fonts to be read and written (especially in case we make +-# directories) by everyone. +-umask 0 +case ":${MT_FEATURES}:" in +*:varfonts:*) + if test -w "$MT_VARTEXFONTS" ; then @@ -179,13 +117,9 @@ + test -d $MT_VARTEXFONTS || mkdir -p $MT_VARTEXFONTS + fi +esac -+ -+# Cache values that may be useful for recursive calls. -+export MT_MKTEX_OPT MT_MKTEX_CNF -+export MT_MKTEXNAM MT_MKTEXNAM_OPT -+export MT_MKTEXDIR MT_MKTEXDIR_OPT -+export MT_MKTEXUPD -+export MT_TEXMFMAIN MT_VARTEXFONTS + + # Cache values that may be useful for recursive calls. + export MT_MKTEX_OPT MT_MKTEX_CNF --- texmf/web2c/texmf.cnf +++ texmf/web2c/texmf.cnf 2012-04-25 14:16:47.365727641 +0000 @@ -53,31 +53,34 @@ TEXMFROOT = $SELFAUTOPARENT ++++++ texlive-specs.tar.xz ++++++ Files /var/tmp/diff_new_pack.jymDp3/_old and /var/tmp/diff_new_pack.jymDp3/_new differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org