From 8e509d91d41e31968b44275f049ad0d0e1789c7d Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Sun, 16 Oct 2016 14:43:11 -0400
Subject: [PATCH] redo font triggers to stop infinite loop, remove weird _ in
 abraces versioning

---
 texlive.spec | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/texlive.spec b/texlive.spec
index 653309e..9e2330c 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,6 +1,6 @@
 %global source_date 20160520
 %global tl_version 2016
-%global tl_rel 10
+%global tl_rel 11
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -7426,6 +7426,8 @@ Obsoletes: kpathsea < %{tl_version}
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires(post,postun): /sbin/install-info
 Requires: texlive-kpathsea-bin
+Requires: coreutils
+Requires: grep
 Provides: tex(fmtutil.cnf) = %{tl_version}
 Provides: tex(mktex.cnf) = %{tl_version}
 Provides: tex(texmf.cnf) = %{tl_version}
@@ -7462,27 +7464,29 @@ export TEXMFCACHE=/var/lib/texmf
 %transfiletriggerpostun kpathsea -- %{_texdir}
 %{_bindir}/texhash 2> /dev/null
 
-%transfiletriggerin kpathsea -- %{_texdir}/texmf-dist/fonts/map/
-while read file; do
-	shortfile=`basename $file`
+%transfiletriggerin kpathsea -- %{_texdir}/texmf-dist/fonts/map/dvips/
+list=`grep "\.map" | sort -n | uniq`
+while read -r line; do
+	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 MultiMap=$shortfile > /dev/null 2>&1
+		%{_bindir}/updmap-sys --nomkmap --enable MixedMap=$shortfile >/dev/null || :
 	else
-		%{_bindir}/updmap-sys --nomkmap --enable Map=$shortfile > /dev/null 2>&1
+		%{_bindir}/updmap-sys --nomkmap --enable Map=$shortfile >/dev/null || :
 	fi
-done
-%{_bindir}/updmap-sys --quiet --nomkmap &> /dev/null
+done <<< "$list"
+%{_bindir}/updmap-sys --quiet --nomkmap >/dev/null || :
 
-%transfiletriggerpostun kpathsea -- %{_texdir}/texmf-dist/fonts/map/
-while read file; do
+%transfiletriggerpostun kpathsea -- %{_texdir}/texmf-dist/fonts/map/dvips/
+list=`grep "\.map" | sort -n | uniq`
+while read -r line; do
 	shortfile=`basename $file`
 	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 MultiMap=$shortfile > /dev/null 2>&1
+		%{_bindir}/updmap-sys --nomkmap --disable MixedMap=$shortfile >/dev/null || :
 	else
-		%{_bindir}/updmap-sys --nomkmap --disable Map=$shortfile > /dev/null 2>&1
+		%{_bindir}/updmap-sys --nomkmap --disable Map=$shortfile >/dev/null || :
 	fi
-done
-%{_bindir}/updmap-sys --quiet --nomkmap &> /dev/null
+done <<< "$list"
+%{_bindir}/updmap-sys --quiet --nomkmap >/dev/null || :
 
 %package lib
 Summary: Shared libraries for TeX-related files
@@ -8111,7 +8115,7 @@ Documentation for abntex2
 Provides: tex-abraces = %{tl_version}
 License: LPPL
 Summary: Asymmetric over-/underbraces in maths
-Version: svn27880.1._
+Version: svn27880.2
 Release: %{tl_noarch_release}.1
 BuildArch: noarch
 Requires: texlive-base
@@ -8126,7 +8130,7 @@ supplement new constructions of the traditional \overbrace and
 
 %package abraces-doc
 Summary: Documentation for abraces
-Version: svn27880.1._
+Version: svn27880.2
 Release: %{tl_noarch_release}.1
 Provides: tex-abraces-doc
 BuildArch: noarch
@@ -221960,6 +221964,11 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Oct 14 2016 Tom Callaway <spot@fedoraproject.org> 5:2016-11.2016520
+- redo font triggers entirely, they actually work now, only process the files they should
+  and no longer loop forever
+- remove weird _ in abraces versioning
+
 * Wed Oct 12 2016 Tom Callaway <spot@fedoraproject.org> 5:2016-10.2016520
 - patch biber bst files to use \scshape instead of obsoleted \sc
 - fixup font map triggers