SHA256
1
0
forked from pool/texlive
Dr. Werner Fink 2017-05-26 14:46:23 +00:00 committed by Git OBS Bridge
parent ce2da99c77
commit 70dc6332b9
3 changed files with 24 additions and 10 deletions

View File

@ -392,7 +392,7 @@
% Where to look for ls-R files. There need not be an ls-R in the
% directories in this path, but if there is one, Kpathsea will use it.
@@ -102,13 +102,13 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
@@ -102,24 +102,23 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHO
% does not create ls-R files in the non-!! elements -- because if an
% ls-R is present, it will be used, and the disk will not be searched.
% This is arguably a bug in kpathsea.
@ -408,7 +408,11 @@
% First writable tree here is used by Lua(La)TeX for the font cache.
% LuaLaTeX uses the value here, while ConTeXt uses the same variable but
@@ -119,7 +119,6 @@ TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
% from texmfcnf.lua; therefore the two values should be kept in sync.
% (As should everything else in texmf.cnf <-> texmfcnf.lua.)
-TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
+TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR;$HOMECACHE
% Where generated fonts may be written. This tree is used when the sources
% were found in a system tree and either that tree wasn't writable, or the
% varfonts feature was enabled in MT_FEATURES in mktex.cnf.
@ -572,11 +576,10 @@
OTPINPUTS = .;$TEXMF/omega/otp//
OCPINPUTS = .;$TEXMF/omega/ocp//
@@ -489,33 +489,34 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% since we don't want to scatter ../'s throughout the value. Hence we
@@ -490,32 +490,38 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
% explicitly list every directory. Arguably more understandable anyway.
%
-TEXMFCNF = {\
TEXMFCNF = {\
-$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,\
-$SELFAUTOLOC/share/texmf-dist/web2c,\
@ -602,8 +605,11 @@
-$SELFAUTOPARENT/texmf-local/web2c,\
-$SELFAUTOPARENT/texmf-dist/web2c,\
-$SELFAUTOPARENT/texmf/web2c\
-}
+TEXMFCNF = /etc/texmf;/etc/texmf/web2c;/var/lib/texmf/web2c;$TEXMF/web2c
+/etc/texmf,\
+/etc/texmf/web2c,\
+/var/lib/texmf/web2c,\
+/usr/share/texmf/web2c\
}
+%TEXMFCNF = {\
+%$SELFAUTOLOC,\
+%$SELFAUTOLOC/share/texmf-local/web2c,\
@ -634,7 +640,7 @@
%
% For reference, here is the old brace-using definition:
%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -568,7 +569,6 @@ extractbb,\
@@ -568,7 +574,6 @@ extractbb,\
gregorio,\
kpsewhich,\
makeindex,\
@ -642,7 +648,7 @@
repstopdf,\
% we'd like to allow:
@@ -791,3 +791,33 @@ max_cols.gftype = 8191
@@ -791,3 +796,33 @@ max_cols.gftype = 8191
% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
% Default is 0, to not guess.
guess_input_kanji_encoding = 1

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 26 11:07:07 UTC 2017 - werner@suse.de
- Use lua compatible configuration for TEXMFCNF in texmf.cnf
-------------------------------------------------------------------
Wed May 3 11:50:38 CEST 2017 - kukuk@suse.de

View File

@ -19,7 +19,7 @@
%define texlive_version 2016
%define texlive_previous 2015
%define texlive_release 20160523
%define texlive_noarch 117
%define texlive_noarch 122
%define texlive_source texlive-20160523-source
%define __perl_requires %{nil}
@ -3945,6 +3945,9 @@ rm -f /var/run/texlive/run-update
#%config(noreplace) %verify(not md5 size mtime) %{_texmfconfdir}/web2c/texmf.cnf
#%verify(link) %{_texmfmaindir}/web2c/fmtutil.cnf
#%verify(link) %{_texmfmaindir}/web2c/texmf.cnf
# is part of texlive-luatex
#%config(noreplace) %verify(not md5 size mtime) %{_texmfconfdir}/web2c/texmfcnf.lua
#%verify(link) %{_texmfmaindir}/web2c/texmfcnf.lua
%{_mandir}/man8/public.*
%verify(link) /var/adm/update-scripts/%{name}-%{version}-%{release}-zypper