From 3f05a58a0ff5cecb5418ca00512f852595f0a549a26cafac11960455b8df1081 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 22 Jun 2012 16:28:48 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive-filesystem?expand=0&rev=5
---
 SuSEconfig.texlive         | 21 ++++++++++++++-------
 texlive-filesystem.changes |  5 +++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/SuSEconfig.texlive b/SuSEconfig.texlive
index b5dc8e7..6375f64 100644
--- a/SuSEconfig.texlive
+++ b/SuSEconfig.texlive
@@ -23,7 +23,6 @@ export LANG MKTEXLSR
 
 mkdir -p /var/run/texlive
 test $? -gt 0 && exit 0
-trap 'rm -rf /var/run/texlive' EXIT
 
 rotator ()
 {
@@ -58,11 +57,13 @@ unset KPSE_DOT || true
 : ${TEXMFMAIN:=$(kpsewhich --expand-path='$TEXMFMAIN' 2> /dev/null)}
 : ${TEXMFDIST:=$(kpsewhich --expand-path='$TEXMFDIST' 2> /dev/null)}
 : ${TEXMFVAR:=$(kpsewhich --var-value=TEXMFVAR 2> /dev/null)}
-: ${TEXMFCNF:=$(kpsewhich texmf.cnf 2> /dev/null)}
+: ${TEXMFCNFFILE:=$(kpsewhich texmf.cnf 2> /dev/null)}
 : ${TEXMFSYSCONFIG:=$(kpsewhich --expand-path='$TEXMFSYSCONFIG' 2> /dev/null)}
 : ${TEXMFLSR:=$(kpsewhich --show-path=ls-R 2> /dev/null)}
 : ${WEB2C:=$TEXMFVAR/web2c}
 
+test -L "$TEXMFCNFFILE" && TEXMFCNFFILE="$(readlink -f "$TEXMFCNFFILE" 2> /dev/null)"
+
 size=$(find /etc/texmf/ls-R  -follow -printf '%s')
 test $size -lt 80 && > /var/run/texlive/run-mktexlsr
 
@@ -94,6 +95,14 @@ if test -e /var/run/texlive/run-fmtutil; then
     let rc+=$?
     rm -f /var/run/texlive/run-fmtutil
 fi
+if test -x /usr/bin/mtxrun ; then
+    test $VERBOSE = true && echo -e "\r[ ]Generate file database."
+    TEXMF=${TEXMFDIST} \
+    TEXMFCACHE=${$TEXMFVAR} \
+    TEXMFCNF=${TEXMFCNFFILE%/*} \
+    /usr/bin/mtxrun --generate < /dev/null 1>&4 2>&4
+    let rc+=$?
+fi
 if test -e /var/run/texlive/run-updmap; then
     test $VERBOSE = true && echo -e "\r[ ]Updating TeX font mappings."
     updmap-sys --nohash < /dev/null 1>&4 2>&4
@@ -124,12 +133,10 @@ fi
 type -p readlink      &> /dev/null || exit 0
 type -p texconfig-sys &> /dev/null || exit 0
 
-test -L "$TEXMFCNF" && TEXMFCNF="$(readlink -f "$TEXMFCNF" 2> /dev/null)"
-
 #
 # Configuration broken
 #
-if test ! -e "$TEXMFCNF" ; then
+if test ! -e "$TEXMFCNFFILE" ; then
     echo "${0##*/}: Configuration of texlive installation not found."
     exit 0
 fi
@@ -138,7 +145,7 @@ init=false
 for f in $(find ${WEB2C}/ -name '*.fmt' -name '*.mem' -o -name '*.base') ; do
     test -e "$f" || continue
     test -L "$f" && continue
-    test "$TEXMFCNF" -nt "$f" && init=true
+    test "$TEXMFCNFFILE" -nt "$f" && init=true
     test -s "$f" && touch "$f"
 done
 if test $init = true ; then
@@ -173,7 +180,7 @@ cnf_mfont=$(tcfmgr --cmd find --file mktex.cnf)
  cnf_xdvi=$(tcfmgr --cmd find --file XDvi)
 cnf_dvips=$(tcfmgr --cmd find --file config.ps)
  cnf_lang=$(TEXMF=$TEXMFSYSCONFIG kpsewhich language.dat 2> /dev/null)
- cnf_base=$(TEXMF=$TEXMF kpsewhich language.us 2> /dev/null)
+ cnf_base=$(TEXMF=$TEXMFMAIN kpsewhich language.us 2> /dev/null)
 
 test -n "${cnf_mfont}" || exit 0
 test -n "${cnf_xdvi}"  || exit 0
diff --git a/texlive-filesystem.changes b/texlive-filesystem.changes
index 653e79f..f2fb887 100644
--- a/texlive-filesystem.changes
+++ b/texlive-filesystem.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 22 16:28:01 UTC 2012 - werner@suse.de
+
+- Do not remove /var/run/texlive, add mtxrun to update script 
+
 -------------------------------------------------------------------
 Fri Jun 22 13:11:08 UTC 2012 - werner@suse.de