rpms
/
texlive
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more trigger improvements, fix hardcoded TEXMFCMF to have texlive paths

This commit is contained in:
Tom Callaway 2016-10-24 16:47:19 -04:00
parent 69737117f1
commit 830ca401ba
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
texlive-2016-kpathsea-texlive-path.patch Normal file
View File

@ -0,0 +1,40 @@
diff -up source/texk/kpathsea/texmf.cnf.fixme source/texk/kpathsea/texmf.cnf
--- source/texk/kpathsea/texmf.cnf.fixme 2016-10-19 15:35:25.804218872 -0400
+++ source/texk/kpathsea/texmf.cnf 2016-10-19 15:37:19.308035612 -0400
@@ -491,17 +491,17 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
%
TEXMFCNF = {\
$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,\
-$SELFAUTOLOC/share/texmf-dist/web2c,\
-$SELFAUTOLOC/share/texmf/web2c,\
+$SELFAUTOLOC/share/texlive/texmf-local/web2c,\
+$SELFAUTOLOC/share/texlive/texmf-dist/web2c,\
+$SELFAUTOLOC/share/texlive/texmf/web2c,\
$SELFAUTOLOC/texmf-local/web2c,\
$SELFAUTOLOC/texmf-dist/web2c,\
$SELFAUTOLOC/texmf/web2c,\
\
$SELFAUTODIR,\
-$SELFAUTODIR/share/texmf-local/web2c,\
-$SELFAUTODIR/share/texmf-dist/web2c,\
-$SELFAUTODIR/share/texmf/web2c,\
+$SELFAUTODIR/share/texlive/texmf-local/web2c,\
+$SELFAUTODIR/share/texlive/texmf-dist/web2c,\
+$SELFAUTODIR/share/texlive/texmf/web2c,\
$SELFAUTODIR/texmf-local/web2c,\
$SELFAUTODIR/texmf-dist/web2c,\
$SELFAUTODIR/texmf/web2c,\
@@ -509,9 +509,9 @@ $SELFAUTODIR/texmf/web2c,\
$SELFAUTOGRANDPARENT/texmf-local/web2c,\
$SELFAUTOPARENT,\
\
-$SELFAUTOPARENT/share/texmf-local/web2c,\
-$SELFAUTOPARENT/share/texmf-dist/web2c,\
-$SELFAUTOPARENT/share/texmf/web2c,\
+$SELFAUTOPARENT/share/texlive/texmf-local/web2c,\
+$SELFAUTOPARENT/share/texlive/texmf-dist/web2c,\
+$SELFAUTOPARENT/share/texlive/texmf/web2c,\
$SELFAUTOPARENT/texmf-local/web2c,\
$SELFAUTOPARENT/texmf-dist/web2c,\
$SELFAUTOPARENT/texmf/web2c\

14
texlive.spec
View File

@ -1,6 +1,6 @@
%global source_date 20160520
%global tl_version 2016
%global tl_rel 15
%global tl_rel 16
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -56,6 +56,7 @@ Patch1: tl-kpfix.patch
Patch2: tl-format.patch
Patch3: texlive-20160520-selinux-context.patch
Patch4: texlive-fix-system-teckit.patch
Patch5: texlive-2016-kpathsea-texlive-path.patch
Patch100: texlive-bz979176.patch
Patch101: etex-addlanguage-fix-bz1215257.patch
Patch102: texlive-latexpand-perl518.patch
@ -7468,7 +7469,8 @@ export TEXMFCACHE=/var/lib/texmf
%transfiletriggerin kpathsea -- %{_texdir}/texmf-dist/fonts/map/dvips/
list=`grep "\.map" | sort -n | uniq`
while read -r line; do
shortfile=`basename $line`
[ -z "$line" ] && continue
shortfile=`basename "$line"`
if `echo $shortfile | grep -Eq 'allrunes.map|arabtex.map|arss.map|artm.map|bbold.map|cbgreek-full.map|ccpl.map|cmextra.map|cmll.map|cm.map|cm-super-t1.map|cm-super-t2a.map|cm-super-t2b.map|cm-super-t2c.map|cm-super-ts1.map|cm-super-x2.map|cmtext-bsr-interpolated.map|cyrillic.map|dvng.map|esint.map|ethiop.map|eurosym.map|hfbright.map|iby.map|latxfont.map|lxfonts.map|manfnt.map|mflogo.map|mongolian.map|musix.map|pigpen.map|plother.map|pltext.map|rsfs.map|semaf.map|stmaryrd.map|symbols.map|tipa.map|trajan.map|vnrother.map|vnrtext.map|wasy.map|xypic.map|yhmath.map'`; then
%{_bindir}/updmap-sys --nomkmap --enable MixedMap=$shortfile >/dev/null 2>&1 || :
else
@ -7480,7 +7482,8 @@ done <<< "$list"
%transfiletriggerpostun kpathsea -- %{_texdir}/texmf-dist/fonts/map/dvips/
list=`grep "\.map" | sort -n | uniq`
while read -r line; do
shortfile=`basename $line`
[ -z "$line" ] && continue
shortfile=`basename "$line"`
if `echo $shortfile | grep -Eq 'allrunes.map|arabtex.map|arss.map|artm.map|bbold.map|cbgreek-full.map|ccpl.map|cmextra.map|cmll.map|cm.map|cm-super-t1.map|cm-super-t2a.map|cm-super-t2b.map|cm-super-t2c.map|cm-super-ts1.map|cm-super-x2.map|cmtext-bsr-interpolated.map|cyrillic.map|dvng.map|esint.map|ethiop.map|eurosym.map|hfbright.map|iby.map|latxfont.map|lxfonts.map|manfnt.map|mflogo.map|mongolian.map|musix.map|pigpen.map|plother.map|pltext.map|rsfs.map|semaf.map|stmaryrd.map|symbols.map|tipa.map|trajan.map|vnrother.map|vnrtext.map|wasy.map|xypic.map|yhmath.map'`; then
%{_bindir}/updmap-sys --nomkmap --disable MixedMap=$shortfile >/dev/null 2>&1 || :
else
@ -179999,6 +180002,7 @@ cp %{SOURCE7597} .
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
# security fix for bz#979176
%patch100 -p0
for l in `unxz -c %{SOURCE3} | tar t`; do
@ -222000,6 +222004,10 @@ fi
%{_libdir}/pkgconfig/*.pc
%changelog
* Mon Oct 24 2016 Tom Callaway <spot@fedoraproject.org> 5:2016-16.2016520
- more trigger improvements
- fix hardcoded TEXMFCMF to have texlive paths
* Fri Oct 21 2016 Marek Kasik <mkasik@redhat.com> 5:2016-15.2016520
- Rebuild for poppler-0.48.0