fix triggers to force enable new maps and run syncwithtrees before doing map operations, apply tibbs fix for fmtutil cnf handling

This commit is contained in:
Tom Callaway 2018-07-02 13:56:36 -04:00
parent 2225dd4c4b
commit 163238ff71

View File

@ -21,7 +21,7 @@
Name: %{shortname}-base Name: %{shortname}-base
Version: %{source_date} Version: %{source_date}
Release: 12%{?dist} Release: 14%{?dist}
Epoch: 7 Epoch: 7
Summary: TeX formatting system Summary: TeX formatting system
# The only files in the base package are directories, cache, and license texts # The only files in the base package are directories, cache, and license texts
@ -6540,19 +6540,25 @@ export TEXMFCACHE=/var/lib/texmf
%{_bindir}/texhash 2> /dev/null || : %{_bindir}/texhash 2> /dev/null || :
%transfiletriggerin -n %{shortname}-kpathsea -- %{_texdir}/texmf-dist/fonts/map/dvips/ %transfiletriggerin -n %{shortname}-kpathsea -- %{_texdir}/texmf-dist/fonts/map/dvips/
# REBUILD ALL THE THINGS
yes | %{_bindir}/updmap-sys --syncwithtrees >/dev/null 2>&1 || :
list=`grep "\.map" | sort -n | uniq` list=`grep "\.map" | sort -n | uniq`
while read -r line; do while read -r line; do
[ -z "$line" ] && continue [ -z "$line" ] && continue
shortfile=`basename "$line"` 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 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 || : %{_bindir}/updmap-sys --nomkmap --enable MixedMap=$shortfile >/dev/null 2>&1 || :
%{_bindir}/updmap-sys --force --enable MixedMap=$shortfile >/dev/null 2>&1 || :
else else
%{_bindir}/updmap-sys --nomkmap --enable Map=$shortfile >/dev/null 2>&1 || : %{_bindir}/updmap-sys --nomkmap --enable Map=$shortfile >/dev/null 2>&1 || :
%{_bindir}/updmap-sys --force --enable Map=$shortfile >/dev/null 2>&1 || :
fi fi
done <<< "$list" done <<< "$list"
%{_bindir}/updmap-sys --quiet --nomkmap >/dev/null || : %{_bindir}/updmap-sys --quiet --nomkmap >/dev/null || :
%transfiletriggerpostun -n %{shortname}-kpathsea -- %{_texdir}/texmf-dist/fonts/map/dvips/ %transfiletriggerpostun -n %{shortname}-kpathsea -- %{_texdir}/texmf-dist/fonts/map/dvips/
# REBUILD ALL THE THINGS
yes | %{_bindir}/updmap-sys --syncwithtrees >/dev/null 2>&1 || :
list=`grep "\.map" | sort -n | uniq` list=`grep "\.map" | sort -n | uniq`
while read -r line; do while read -r line; do
[ -z "$line" ] && continue [ -z "$line" ] && continue
@ -8506,6 +8512,13 @@ done <<< "$list"
%doc %{_texdir}/texmf-dist/doc/latex/yplan/ %doc %{_texdir}/texmf-dist/doc/latex/yplan/
%changelog %changelog
* Mon Jul 2 2018 Tom Callaway <spot@fedoraproject.org> - 7:20180414-14
- fix triggers to force enable of new maps and run syncwithtrees before doing map operations
* Tue Jun 26 2018 Tom Callaway <spot@fedoraproject.org> - 7:20180414-13
- apply tibbs's fix (PR#4) for fmtutil cnf handling without tons of ugly scriptlets
- explicitly run updmap-sys in the kpathsea triggers, bug reports imply this is needed
* Tue Jun 19 2018 Tom Callaway <spot@fedoraproject.org> - 7:20180414-12 * Tue Jun 19 2018 Tom Callaway <spot@fedoraproject.org> - 7:20180414-12
- add Requires: tex(fvextra.sty) to pythontex (bz1590621) - add Requires: tex(fvextra.sty) to pythontex (bz1590621)