diff --git a/.gitignore b/.gitignore
index 83252ad..beb3245 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5200,7 +5200,7 @@
 /texlive-scripts.tar.xz
 /texlive-sr.doc.tar.xz
 /texlive-zh-cn.doc.tar.xz
-/texlive-20130531_r30819-source.tar.xz
+/texlive-20130608_r30832-source.tar.xz
 /texloganalyser.doc.tar.xz
 /texloganalyser.i386-linux.tar.xz
 /texloganalyser.tar.xz
diff --git a/co_archive b/co_archive
index f2f340b..b2d4457 100755
--- a/co_archive
+++ b/co_archive
@@ -14,8 +14,8 @@ echo "Syncing with remote server..."
 [ -e texlive/archive/musixtex-fnts.doc.tar.xz ] && mv texlive/archive/musixtex-fnts.doc.tar.xz texlive/archive/musixtex-fonts.doc.tar.xz
 #rsync -av --delete ftp.cstug.cz::pub/tex/local/tlpretest/archive texlive --delete-excluded \
 #rsync -av --delete rsync://ftp.ctex.org/mirrors/texlive/tlpretest/ texlive --delete-excluded \
-#rsync -av --delete rsync://ftp.ctex.org/mirrors/CTAN/systems/texlive/tlnet/ texlive --delete-excluded \
 #rsync -av --delete rsync://ftp.fernuni-hagen.de/ctan/systems/texlive/tlnet/archive texlive --delete-excluded \
+#rsync -av --delete rsync://ftp.ctex.org/mirrors/CTAN/systems/texlive/tlnet/ texlive --delete-excluded \
 rsync -av --delete ftp.cstug.cz::pub/tex/local/tlpretest/archive texlive --delete-excluded \
 --exclude '*mactex*' \
 --exclude '*.win32*' \
diff --git a/sources b/sources
index 646db1a..942bc1f 100644
--- a/sources
+++ b/sources
@@ -5200,7 +5200,7 @@ b74ce3aee8ef888536fe2a9219e962b5  texlive-scripts.doc.tar.xz
 9e76d60dec639edd4e250b04d4f74766  texlive-scripts.tar.xz
 c6742942b42399b8bc4ff617b783b524  texlive-sr.doc.tar.xz
 910901aee9fe78d9956a850880914eaf  texlive-zh-cn.doc.tar.xz
-b64ab5ac8f485e880c809d4f6b7b5d83  texlive-20130531_r30819-source.tar.xz
+777eec41dcfb2231c6b2ee4242246295  texlive-20130608_r30832-source.tar.xz
 dd61bb4c5e070a47a96149d9e2e21445  texloganalyser.doc.tar.xz
 b9a82dd58b5f132bae570c57a11db4aa  texloganalyser.i386-linux.tar.xz
 9c5b6a7021b601df4285d02bba729d0d  texloganalyser.tar.xz
diff --git a/texlive.spec b/texlive.spec
index 7fb0af7..27a0531 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,6 +1,6 @@
-%global source_date 20130531_r30819
-%global tl_version 2012
-%global tl_rel 25
+%global source_date 20130608_r30832
+%global tl_version 2013
+%global tl_rel 0.1
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -17,7 +17,7 @@
 Name: texlive
 Version: %{tl_version}
 Release: %{tl_release}
-Epoch: 2
+Epoch: 3
 Summary: TeX formatting system
 Group: Applications/Publishing
 License: Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia
@@ -7273,7 +7273,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(pifont.sty)
 Provides: tex(OrnementsADF.enc) = %{tl_version}
@@ -7296,15 +7296,14 @@ date: 2010-10-06 08:49:34 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map OrnementsADF.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map OrnementsADF.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=OrnementsADF.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun adforn
 if [ $1 == 0 ] ; then
-sed -i '/^Map OrnementsADF.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=OrnementsADF.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -7340,7 +7339,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(pifont.sty)
 Requires: tex(fp.sty)
@@ -7370,18 +7369,16 @@ date: 2010-09-13 13:22:42 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ArrowsADF.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ArrowsADF.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map BulletsADF.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map BulletsADF.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ArrowsADF.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=BulletsADF.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun adfsymbols
 if [ $1 == 0 ] ; then
-sed -i '/^Map ArrowsADF.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map BulletsADF.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ArrowsADF.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=BulletsADF.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -8570,7 +8567,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-latex
 Requires: tex-plain
@@ -8839,7 +8836,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: texlive-luatex-bin
 Provides: tex(luatex-unicode-letters.tex) = %{tl_version}
@@ -8917,7 +8914,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-kpathsea
 Requires: texlive-pdftex-bin
@@ -9552,7 +9549,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(ifthen.sty)
 Provides: tex(allrunes.map) = %{tl_version}
@@ -9792,15 +9789,14 @@ date: 2007-01-14 10:14:42 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap allrunes.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap allrunes.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=allrunes.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun allrunes
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap allrunes.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=allrunes.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -10249,7 +10245,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cm.map) = %{tl_version}
 Provides: tex(cmextra.map) = %{tl_version}
@@ -10525,30 +10521,24 @@ date: 2013-01-28 18:05:09 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap cm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cm.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap cmextra.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cmextra.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap cyrillic.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cyrillic.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map      euler.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map      euler.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap latxfont.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap latxfont.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap symbols.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap symbols.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cm.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cmextra.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cyrillic.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=     euler.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=latxfont.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=symbols.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun amsfonts
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap cm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap cmextra.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap cyrillic.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map      euler.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap latxfont.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap symbols.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cm.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cmextra.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cyrillic.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=     euler.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=latxfont.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=symbols.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -10749,7 +10739,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-tex
 Requires: texlive-amstex-bin
@@ -10816,7 +10806,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-kpathsea
 Requires: tex-plain
@@ -11069,7 +11059,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(uaq.map) = %{tl_version}
 Provides: tex(uaqr7tc.tfm) = %{tl_version}
@@ -11107,15 +11097,14 @@ date: 2011-10-11 17:17:32 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map uaq.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map uaq.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=uaq.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun antiqua
 if [ $1 == 0 ] ; then
-sed -i '/^Map uaq.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=uaq.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -11233,7 +11222,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(omega.cfg) = %{tl_version}
 Provides: tex(omega.map) = %{tl_version}
@@ -11310,15 +11299,14 @@ date: 2009-11-09 23:44:56 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map omega.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map omega.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=omega.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun omega
 if [ $1 == 0 ] ; then
-sed -i '/^Map omega.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=omega.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -11354,7 +11342,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(antt-cs.enc) = %{tl_version}
 Provides: tex(antt-ec.enc) = %{tl_version}
@@ -11835,15 +11823,14 @@ date: 2007-08-24 10:36:49 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map antt.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map antt.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=antt.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun antt
 if [ $1 == 0 ] ; then
-sed -i '/^Map antt.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=antt.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -12540,7 +12527,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(amssymb.sty)
 Requires: tex(inputenc.sty)
@@ -12761,15 +12748,14 @@ date: 2011-12-04 22:44:34 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map arabi.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map arabi.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=arabi.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun arabi
 if [ $1 == 0 ] ; then
-sed -i '/^Map arabi.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=arabi.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -12805,7 +12791,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(arabtex.map) = %{tl_version}
 Provides: tex(hcaption.tfm) = %{tl_version}
@@ -12929,15 +12915,14 @@ date: 2012-03-20 14:44:41 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap arabtex.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap arabtex.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=arabtex.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun arabtex
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap arabtex.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=arabtex.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -13106,7 +13091,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(syriac.map) = %{tl_version}
 Provides: tex(assy.tfm) = %{tl_version}
@@ -13139,15 +13124,14 @@ date: 2013-04-18 13:30:17 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map syriac.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map syriac.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=syriac.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun aramaic-serto
 if [ $1 == 0 ] ; then
-sed -i '/^Map syriac.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=syriac.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -13299,7 +13283,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(amssymb.sty)
 Requires: tex(amsfonts.sty)
@@ -13379,15 +13363,14 @@ date: 2007-02-25 15:08:52 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map arev.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map arev.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=arev.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun arev
 if [ $1 == 0 ] ; then
-sed -i '/^Map arev.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=arev.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -13423,7 +13406,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(aramaic.map) = %{tl_version}
 Provides: tex(archaicprw.map) = %{tl_version}
@@ -13538,15 +13521,14 @@ date: 2006-11-08 11:10:08 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map archaicprw.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map archaicprw.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=archaicprw.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun archaic
 if [ $1 == 0 ] ; then
-sed -i '/^Map archaicprw.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=archaicprw.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -13593,7 +13575,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(bkaiu.map) = %{tl_version}
 Provides: tex(bsmiu.map) = %{tl_version}
@@ -14764,24 +14746,20 @@ date: 2007-05-25 18:39:01 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map bkaiu.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map bkaiu.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map bsmiu.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map bsmiu.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map gbsnu.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gbsnu.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map gkaiu.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gkaiu.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=bkaiu.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=bsmiu.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=gbsnu.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=gkaiu.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun arphic
 if [ $1 == 0 ] ; then
-sed -i '/^Map bkaiu.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map bsmiu.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map gbsnu.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map gkaiu.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=bkaiu.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=bsmiu.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gbsnu.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gkaiu.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -15204,7 +15182,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xspace.sty)
 Provides: tex(ascii.map) = %{tl_version}
@@ -15225,15 +15203,14 @@ date: 2013-04-15 01:42:14 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ascii.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ascii.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ascii.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun ascii-font
 if [ $1 == 0 ] ; then
-sed -i '/^Map ascii.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ascii.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -15269,7 +15246,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(aspectratio.map) = %{tl_version}
 Provides: tex(amarbi.tfm) = %{tl_version}
@@ -15325,15 +15302,14 @@ date: 2012-01-28 10:04:30 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map aspectratio.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map aspectratio.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=aspectratio.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun aspectratio
 if [ $1 == 0 ] ; then
-sed -i '/^Map aspectratio.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=aspectratio.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -15595,7 +15571,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(augie.map) = %{tl_version}
 Provides: tex(augie7t.tfm) = %{tl_version}
@@ -15621,15 +15597,14 @@ date: 2006-12-29 12:26:56 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map augie.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map augie.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=augie.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun augie
 if [ $1 == 0 ] ; then
-sed -i '/^Map augie.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=augie.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -15665,7 +15640,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(auncial.map) = %{tl_version}
 Provides: tex(auncl10.tfm) = %{tl_version}
@@ -15694,15 +15669,14 @@ date: 2008-08-16 20:32:59 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map auncial.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map auncial.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=auncial.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun auncial-new
 if [ $1 == 0 ] ; then
-sed -i '/^Map auncial.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=auncial.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -15738,7 +15712,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(aurical.map) = %{tl_version}
 Provides: tex(AmiciLogo.tfm) = %{tl_version}
@@ -15810,15 +15784,14 @@ date: 2008-07-27 23:11:56 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map aurical.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map aurical.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=aurical.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun aurical
 if [ $1 == 0 ] ; then
-sed -i '/^Map aurical.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=aurical.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -19653,7 +19626,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(fontenc.sty)
@@ -19739,15 +19712,14 @@ date: 2010-07-14 23:45:16 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ybv.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ybv.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ybv.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun baskervald
 if [ $1 == 0 ] ; then
-sed -i '/^Map ybv.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ybv.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -20205,7 +20177,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(bbold.map) = %{tl_version}
 Provides: tex(bbold10.pfb) = %{tl_version}
@@ -20229,15 +20201,14 @@ date: 2010-11-21 18:48:27 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap bbold.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap bbold.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=bbold.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun bbold-type1
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap bbold.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=bbold.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -21518,7 +21489,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(belleek.map) = %{tl_version}
 Provides: tex(blex.ttf) = %{tl_version}
@@ -21539,15 +21510,14 @@ date: 2008-11-30 15:59:19 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map belleek.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map belleek.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=belleek.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun belleek
 if [ $1 == 0 ] ; then
-sed -i '/^Map belleek.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=belleek.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -21640,7 +21610,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(fontenc.sty)
 Requires: tex(textcomp.sty)
@@ -21752,15 +21722,14 @@ date: 2008-01-28 20:53:41 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map bera.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map bera.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=bera.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun bera
 if [ $1 == 0 ] ; then
-sed -i '/^Map bera.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=bera.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -21796,7 +21765,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(fontenc.sty)
@@ -21923,15 +21892,14 @@ date: 2012-11-30 15:48:00 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ybd.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ybd.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ybd.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun berenisadf
 if [ $1 == 0 ] ; then
-sed -i '/^Map ybd.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ybd.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -22647,7 +22615,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(ifthen.sty)
 Provides: tex(bguq.map) = %{tl_version}
@@ -22697,15 +22665,14 @@ date: 2012-08-14 15:05:39 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map bguq.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map bguq.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=bguq.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun bguq
 if [ $1 == 0 ] ; then
-sed -i '/^Map bguq.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=bguq.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -26642,7 +26609,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(egothic.sty)
 Requires: tex(huncial.sty)
@@ -26784,15 +26751,14 @@ date: 2008-01-03 17:18:54 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map sqrcaps.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map sqrcaps.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=sqrcaps.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun bookhands
 if [ $1 == 0 ] ; then
-sed -i '/^Map sqrcaps.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=sqrcaps.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -27242,7 +27208,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Provides: tex(boondox.map) = %{tl_version}
@@ -27304,15 +27270,14 @@ date: 2011-05-04 08:36:11 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map boondox.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map boondox.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=boondox.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun boondox
 if [ $1 == 0 ] ; then
-sed -i '/^Map boondox.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=boondox.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -28000,7 +27965,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(pbsi.map) = %{tl_version}
 Provides: tex(pbsi.tfm) = %{tl_version}
@@ -28024,15 +27989,14 @@ date: 2012-10-18 12:56:21 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map pbsi.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map pbsi.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=pbsi.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun brushscr
 if [ $1 == 0 ] ; then
-sed -i '/^Map pbsi.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=pbsi.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -28193,7 +28157,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(relsize.sty)
 Provides: tex(burmese.map) = %{tl_version}
@@ -28213,15 +28177,14 @@ date: 2006-12-21 23:43:15 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map burmese.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map burmese.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=burmese.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun burmese
 if [ $1 == 0 ] ; then
-sed -i '/^Map burmese.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=burmese.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -28636,7 +28599,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(ifxetex.sty)
 Requires: tex(ifluatex.sty)
@@ -29025,15 +28988,14 @@ date: 2013-01-25 11:29:15 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cabin.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cabin.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cabin.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cabin
 if [ $1 == 0 ] ; then
-sed -i '/^Map cabin.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cabin.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -29366,7 +29328,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(calligra.map) = %{tl_version}
 Provides: tex(callig15.pfb) = %{tl_version}
@@ -29381,15 +29343,14 @@ date: 2011-10-16 10:43:33 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map calligra.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map calligra.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=calligra.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun calligra-type1
 if [ $1 == 0 ] ; then
-sed -i '/^Map calligra.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=calligra.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -29683,7 +29644,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Requires: tex(slantsc.sty)
@@ -29833,15 +29794,14 @@ date: 2012-06-11 20:28:41 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cantarell.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cantarell.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cantarell.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cantarell
 if [ $1 == 0 ] ; then
-sed -i '/^Map cantarell.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cantarell.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -30174,7 +30134,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cmin.map) = %{tl_version}
 Provides: tex(cmin10.pfb) = %{tl_version}
@@ -30196,15 +30156,14 @@ date: 2007-02-21 12:51:17 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cmin.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cmin.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cmin.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun carolmin-ps
 if [ $1 == 0 ] ; then
-sed -i '/^Map cmin.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cmin.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -30696,7 +30655,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(CB.enc) = %{tl_version}
 Provides: tex(gmtr.enc) = %{tl_version}
@@ -32602,15 +32561,14 @@ date: 2010-07-13 20:13:45 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap cbgreek-full.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cbgreek-full.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cbgreek-full.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cbfonts
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap cbgreek-full.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cbgreek-full.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -32754,7 +32712,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Provides: tex(ccicons-u.enc) = %{tl_version}
@@ -32775,15 +32733,14 @@ date: 2013-04-17 11:42:52 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ccicons.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ccicons.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ccicons.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun ccicons
 if [ $1 == 0 ] ; then
-sed -i '/^Map ccicons.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ccicons.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -32871,7 +32828,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(ccpl.map) = %{tl_version}
 Provides: tex(pccsc10.tfm) = %{tl_version}
@@ -32909,15 +32866,14 @@ date: 2009-09-24 20:53:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap ccpl.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap ccpl.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=ccpl.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cc-pl
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap ccpl.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=ccpl.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -33290,7 +33246,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(fontenc.sty)
@@ -34210,15 +34166,14 @@ date: 2010-09-08 11:26:01 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map clm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map clm.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=clm.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cfr-lm
 if [ $1 == 0 ] ; then
-sed -i '/^Map clm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=clm.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -34445,7 +34400,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cjhebltx.enc) = %{tl_version}
 Provides: tex(cjhebrew.map) = %{tl_version}
@@ -34475,15 +34430,14 @@ date: 2007-01-01 00:37:00 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cjhebrew.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cjhebrew.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cjhebrew.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cjhebrew
 if [ $1 == 0 ] ; then
-sed -i '/^Map cjhebrew.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cjhebrew.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -35163,7 +35117,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-fonts-tlwg
 Provides: tex(garuda-c90.map) = %{tl_version}
@@ -35179,15 +35133,14 @@ garuda-c90 package
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map garuda-c90.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map garuda-c90.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=garuda-c90.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun garuda-c90
 if [ $1 == 0 ] ; then
-sed -i '/^Map garuda-c90.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=garuda-c90.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -35212,7 +35165,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(lthtlwg.enc) = %{tl_version}
 Provides: tex(nectec.map) = %{tl_version}
@@ -35417,21 +35370,18 @@ date: 2013-02-15 09:53:31 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map nectec.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map nectec.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map nf.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map nf.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map tlwg.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map tlwg.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=nectec.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=nf.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=tlwg.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun fonts-tlwg
 if [ $1 == 0 ] ; then
-sed -i '/^Map nectec.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map nf.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map tlwg.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=nectec.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=nf.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=tlwg.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -35467,7 +35417,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-fonts-tlwg
 Provides: tex(norasi-c90.map) = %{tl_version}
@@ -35483,15 +35433,14 @@ norasi-c90 package
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map norasi-c90.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map norasi-c90.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=norasi-c90.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun norasi-c90
 if [ $1 == 0 ] ; then
-sed -i '/^Map norasi-c90.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=norasi-c90.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -35516,7 +35465,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(umj.map) = %{tl_version}
 Provides: tex(umj00.tfm) = %{tl_version}
@@ -38691,15 +38640,14 @@ date: 2007-07-29 12:13:44 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map umj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map umj.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=umj.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun uhc
 if [ $1 == 0 ] ; then
-sed -i '/^Map umj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=umj.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -38735,7 +38683,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(dgj.map) = %{tl_version}
 Provides: tex(dmj.map) = %{tl_version}
@@ -39866,30 +39814,24 @@ date: 2011-05-21 13:20:15 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map dgj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map dgj.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map dmj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map dmj.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map mc2j.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mc2j.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map mcj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mcj.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map mr2j.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mr2j.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map mrj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mrj.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=dgj.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=dmj.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=mc2j.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=mcj.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=mr2j.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=mrj.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun wadalab
 if [ $1 == 0 ] ; then
-sed -i '/^Map dgj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map dmj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map mc2j.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map mcj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map mr2j.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map mrj.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=dgj.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=dmj.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mc2j.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mcj.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mr2j.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mrj.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -40636,7 +40578,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cmcyr.map) = %{tl_version}
 Provides: tex(cmcb10.tfm) = %{tl_version}
@@ -41237,15 +41179,14 @@ date: 2007-09-16 18:06:50 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cmcyr.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cmcyr.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cmcyr.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cmcyr
 if [ $1 == 0 ] ; then
-sed -i '/^Map cmcyr.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cmcyr.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -41379,7 +41320,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(8r-mod.enc) = %{tl_version}
 Provides: tex(cm-lgc.map) = %{tl_version}
@@ -41848,15 +41789,14 @@ date: 2012-06-26 00:41:30 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cm-lgc.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cm-lgc.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cm-lgc.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cm-lgc
 if [ $1 == 0 ] ; then
-sed -i '/^Map cm-lgc.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cm-lgc.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -41892,7 +41832,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(ifthen.sty)
 Requires: tex(graphicx.sty)
@@ -41983,15 +41923,14 @@ date: 2010-04-20 23:51:50 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap cmll.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cmll.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cmll.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cmll
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap cmll.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cmll.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -42208,7 +42147,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(t1cmr.fd)
 Provides: tex(cm-super-t1.enc) = %{tl_version}
@@ -42649,30 +42588,24 @@ date: 2008-01-16 21:31:11 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap cm-super-t1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cm-super-t1.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap cm-super-t2a.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cm-super-t2a.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap cm-super-t2b.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cm-super-t2b.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap cm-super-t2c.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cm-super-t2c.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap cm-super-ts1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cm-super-ts1.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap cm-super-x2.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cm-super-x2.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cm-super-t1.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cm-super-t2a.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cm-super-t2b.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cm-super-t2c.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cm-super-ts1.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cm-super-x2.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cm-super
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap cm-super-t1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap cm-super-t2a.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap cm-super-t2b.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap cm-super-t2c.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap cm-super-ts1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap cm-super-x2.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cm-super-t1.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cm-super-t2a.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cm-super-t2b.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cm-super-t2c.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cm-super-ts1.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cm-super-x2.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -42772,7 +42705,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cmtext-bsr-interpolated.map) = %{tl_version}
 Provides: tex(cmb10.tfm) = %{tl_version}
@@ -42870,15 +42803,14 @@ date: 2012-06-26 21:09:43 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap cmtext-bsr-interpolated.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap cmtext-bsr-interpolated.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=cmtext-bsr-interpolated.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cm
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap cmtext-bsr-interpolated.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=cmtext-bsr-interpolated.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -44491,7 +44423,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-kpathsea
 Requires: texlive-metafont-bin
@@ -44556,7 +44488,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(mflogo.map) = %{tl_version}
 Provides: tex(logo10.tfm) = %{tl_version}
@@ -44589,15 +44521,14 @@ date: 2010-03-14 23:46:18 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap mflogo.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap mflogo.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=mflogo.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun mflogo
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap mflogo.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=mflogo.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -44736,7 +44667,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: texlive-tetex-bin
 Provides: tex(09fbbfac.enc) = %{tl_version}
@@ -44776,15 +44707,14 @@ date: 2012-09-11 08:43:58 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map mathpple.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mathpple.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=mathpple.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun tetex
 if [ $1 == 0 ] ; then
-sed -i '/^Map mathpple.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mathpple.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -45588,7 +45518,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-latex
 Requires: texlive-latex-bin-bin
@@ -45766,7 +45696,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: texlive-mptopdf-bin
 Provides: tex(mptopdf.tex) = %{tl_version}
@@ -46406,7 +46336,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-graphics
 Requires: tex(keyval.sty)
@@ -46553,24 +46483,20 @@ date: 2011-05-30 10:00:44 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map charter.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map charter.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map fpls.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map fpls.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map pazo.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map pazo.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map utopia.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map utopia.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=charter.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=fpls.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=pazo.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=utopia.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun psnfss
 if [ $1 == 0 ] ; then
-sed -i '/^Map charter.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map fpls.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map pazo.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map utopia.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=charter.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=fpls.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=pazo.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=utopia.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -52412,7 +52338,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-metapost
 Requires: tex-pdftex
@@ -52618,8 +52544,7 @@ sed -i 's/^\#\!\ cont-fr.*$/cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii/' %{
 sed -i 's/^\#\!\ cont-it.*$/cont-it pdftex cont-usr.tex -8bit *cont-it.mkii/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
 sed -i 's/^\#\!\ cont-nl.*$/cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
 sed -i 's/^\#\!\ cont-ro.*$/cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
-sed -i '/^Map original-context-symbol.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map original-context-symbol.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=original-context-symbol.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 touch /var/run/texlive/run-fmtutil
 fi
@@ -52634,7 +52559,7 @@ sed -i 's/^cont-fr.*$/\#\!\ cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii/' %{
 sed -i 's/^cont-it.*$/\#\!\ cont-it pdftex cont-usr.tex -8bit *cont-it.mkii/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
 sed -i 's/^cont-nl.*$/\#\!\ cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
 sed -i 's/^cont-ro.*$/\#\!\ cont-ro pdftex cont-usr.tex -8bit *cont-ro.mkii/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
-sed -i '/^Map original-context-symbol.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=original-context-symbol.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -52681,7 +52606,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-kpathsea
 Requires: texlive-metapost-bin
@@ -52740,15 +52665,14 @@ date: 2012-07-10 12:03:05 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map troff-updmap.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map troff-updmap.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=troff-updmap.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun metapost
 if [ $1 == 0 ] ; then
-sed -i '/^Map troff-updmap.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=troff-updmap.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -52795,7 +52719,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-xetexconfig
 Requires: texlive-xetex-bin
@@ -52907,7 +52831,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(lm-cs.enc) = %{tl_version}
 Provides: tex(lm-cssc.enc) = %{tl_version}
@@ -53803,15 +53727,14 @@ date: 2012-05-22 10:49:40 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map lm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map lm.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=lm.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun lm
 if [ $1 == 0 ] ; then
-sed -i '/^Map lm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=lm.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -53898,7 +53821,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(stmaryrd.map) = %{tl_version}
 Provides: tex(stmary10.tfm) = %{tl_version}
@@ -53929,15 +53852,14 @@ date: 2009-10-10 00:51:28 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap stmaryrd.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap stmaryrd.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=stmaryrd.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun stmaryrd
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap stmaryrd.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=stmaryrd.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -54628,7 +54550,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(SkakNew.map) = %{tl_version}
 Provides: tex(AlphaDia.otf) = %{tl_version}
@@ -54657,15 +54579,14 @@ date: 2009-02-21 22:13:29 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map SkakNew.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map SkakNew.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=SkakNew.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun skaknew
 if [ $1 == 0 ] ; then
-sed -i '/^Map SkakNew.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=SkakNew.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -55745,7 +55666,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Requires: tex(slantsc.sty)
@@ -55992,15 +55913,14 @@ date: 2012-08-27 10:11:59 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map comfortaa.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map comfortaa.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=comfortaa.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun comfortaa
 if [ $1 == 0 ] ; then
-sed -i '/^Map comfortaa.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=comfortaa.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -56162,7 +56082,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Provides: tex(CountriesOfEurope.enc) = %{tl_version}
@@ -56184,15 +56104,14 @@ date: 2012-04-19 16:32:32 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map CountriesOfEurope.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map CountriesOfEurope.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=CountriesOfEurope.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun countriesofeurope
 if [ $1 == 0 ] ; then
-sed -i '/^Map CountriesOfEurope.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=CountriesOfEurope.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -56342,7 +56261,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cs-cyklop-sc.enc) = %{tl_version}
 Provides: tex(cs-cyklop.enc) = %{tl_version}
@@ -56436,15 +56355,14 @@ date: 2008-12-15 08:58:20 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cyklop.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cyklop.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cyklop.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cyklop
 if [ $1 == 0 ] ; then
-sed -i '/^Map cyklop.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cyklop.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -56527,7 +56445,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Provides: tex(dejavumono_il2.enc) = %{tl_version}
@@ -57074,15 +56992,14 @@ date: 2013-01-11 15:42:00 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map dejavu-type1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map dejavu-type1.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=dejavu-type1.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun dejavu
 if [ $1 == 0 ] ; then
-sed -i '/^Map dejavu-type1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=dejavu-type1.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -57168,7 +57085,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(pifont.sty)
 Requires: tex(keyval.sty)
@@ -57190,15 +57107,14 @@ date: 2007-09-25 10:20:14 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map dictsym.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map dictsym.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=dictsym.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun dictsym
 if [ $1 == 0 ] ; then
-sed -i '/^Map dictsym.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=dictsym.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -57290,7 +57206,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(dstroke.map) = %{tl_version}
 Provides: tex(dsrom10.tfm) = %{tl_version}
@@ -57324,15 +57240,14 @@ date: 2009-11-19 15:03:53 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map dstroke.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map dstroke.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=dstroke.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun doublestroke
 if [ $1 == 0 ] ; then
-sed -i '/^Map dstroke.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=dstroke.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -57529,7 +57444,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(droidsans.sty)
 Requires: tex(keyval.sty)
@@ -58076,15 +57991,14 @@ date: 2011-09-12 10:00:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map droid.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map droid.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=droid.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun droid
 if [ $1 == 0 ] ; then
-sed -i '/^Map droid.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=droid.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -58231,7 +58145,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Provides: tex(dutchcal.map) = %{tl_version}
@@ -58259,15 +58173,14 @@ date: 2011-06-24 10:20:36 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map dutchcal.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map dutchcal.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=dutchcal.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun dutchcal
 if [ $1 == 0 ] ; then
-sed -i '/^Map dutchcal.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=dutchcal.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -58355,7 +58268,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(ifxetex.sty)
 Requires: tex(ifluatex.sty)
@@ -58675,15 +58588,14 @@ date: 2013-05-22 20:40:58 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map EBGaramond.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map EBGaramond.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=EBGaramond.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun ebgaramond
 if [ $1 == 0 ] ; then
-sed -i '/^Map EBGaramond.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=EBGaramond.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -59404,7 +59316,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(fontenc.sty)
@@ -59688,15 +59600,14 @@ date: 2010-07-28 12:27:25 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map yes.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yes.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=yes.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun electrum
 if [ $1 == 0 ] ; then
-sed -i '/^Map yes.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yes.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -59784,7 +59695,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(pxfonts.sty)
 Provides: tex(epigraficahellenic.enc) = %{tl_version}
@@ -59853,15 +59764,14 @@ date: 2010-02-24 20:55:02 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map epigrafica.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map epigrafica.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=epigrafica.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun epigrafica
 if [ $1 == 0 ] ; then
-sed -i '/^Map epigrafica.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=epigrafica.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -59953,7 +59863,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Provides: tex(ESSTIX.map) = %{tl_version}
@@ -60004,15 +59914,14 @@ date: 2011-05-10 11:05:00 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ESSTIX.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ESSTIX.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ESSTIX.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun esstix
 if [ $1 == 0 ] ; then
-sed -i '/^Map ESSTIX.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ESSTIX.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -60048,7 +59957,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(esvect.map) = %{tl_version}
 Provides: tex(vect10.tfm) = %{tl_version}
@@ -60078,15 +59987,14 @@ date: 2006-10-27 00:09:51 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map esvect.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map esvect.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=esvect.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun esvect
 if [ $1 == 0 ] ; then
-sed -i '/^Map esvect.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=esvect.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -60250,7 +60158,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(amsmath.sty)
@@ -60327,15 +60235,14 @@ date: 2012-05-29 12:56:38 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map fdsymbol.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map fdsymbol.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=fdsymbol.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun fdsymbol
 if [ $1 == 0 ] ; then
-sed -i '/^Map fdsymbol.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=fdsymbol.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -60435,7 +60342,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(fge.map) = %{tl_version}
 Provides: tex(fgeit10.tfm) = %{tl_version}
@@ -60457,15 +60364,14 @@ date: 2011-11-18 06:50:27 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map fge.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map fge.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=fge.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun fge
 if [ $1 == 0 ] ; then
-sed -i '/^Map fge.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=fge.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -60501,7 +60407,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(foekfont.map) = %{tl_version}
 Provides: tex(foekfont.tfm) = %{tl_version}
@@ -60521,15 +60427,14 @@ date: 2007-02-27 14:19:10 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map foekfont.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map foekfont.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=foekfont.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun foekfont
 if [ $1 == 0 ] ; then
-sed -i '/^Map foekfont.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=foekfont.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -60565,7 +60470,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(fontenc.sty)
 Provides: tex(fonetika.map) = %{tl_version}
@@ -60597,15 +60502,14 @@ date: 2008-08-19 20:38:14 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map fonetika.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map fonetika.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=fonetika.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun fonetika
 if [ $1 == 0 ] ; then
-sed -i '/^Map fonetika.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=fonetika.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -60693,7 +60597,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(fontenc.sty)
 Requires: tex(textcomp.sty)
@@ -60910,18 +60814,16 @@ date: 2008-12-13 14:57:21 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map fourier.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map fourier.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map fourier-utopia-expert.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map fourier-utopia-expert.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=fourier.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=fourier-utopia-expert.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun fourier
 if [ $1 == 0 ] ; then
-sed -i '/^Map fourier.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map fourier-utopia-expert.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=fourier.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=fourier-utopia-expert.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -61024,7 +60926,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(fontenc.sty)
 Provides: tex(frcursive.map) = %{tl_version}
@@ -61090,15 +60992,14 @@ date: 2011-11-09 16:18:27 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map frcursive.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map frcursive.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=frcursive.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun frcursive
 if [ $1 == 0 ] ; then
-sed -i '/^Map frcursive.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=frcursive.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -61289,7 +61190,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(euler.sty)
 Requires: tex(txfonts.sty)
@@ -61420,15 +61321,14 @@ date: 2008-08-19 21:00:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gfsartemisia.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gfsartemisia.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gfsartemisia.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gfsartemisia
 if [ $1 == 0 ] ; then
-sed -i '/^Map gfsartemisia.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gfsartemisia.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -61464,7 +61364,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(bodoni.enc) = %{tl_version}
 Provides: tex(bodonidenomnums.enc) = %{tl_version}
@@ -61588,15 +61488,14 @@ date: 2012-05-17 11:22:16 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gfsbodoni.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gfsbodoni.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gfsbodoni.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gfsbodoni
 if [ $1 == 0 ] ; then
-sed -i '/^Map gfsbodoni.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gfsbodoni.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -61632,7 +61531,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(gpcomplutum.enc) = %{tl_version}
 Provides: tex(gfscomplutum.map) = %{tl_version}
@@ -61661,15 +61560,14 @@ date: 2008-08-19 21:00:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gfscomplutum.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gfscomplutum.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gfscomplutum.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gfscomplutum
 if [ $1 == 0 ] ; then
-sed -i '/^Map gfscomplutum.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gfscomplutum.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -61705,7 +61603,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(pxfonts.sty)
 Provides: tex(didot.enc) = %{tl_version}
@@ -61844,15 +61742,14 @@ date: 2008-08-19 21:00:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gfsdidot.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gfsdidot.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gfsdidot.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gfsdidot
 if [ $1 == 0 ] ; then
-sed -i '/^Map gfsdidot.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gfsdidot.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -61888,7 +61785,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(neohellenic.enc) = %{tl_version}
 Provides: tex(neohellenicdenomnums.enc) = %{tl_version}
@@ -62015,15 +61912,14 @@ date: 2009-01-15 17:25:25 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gfsneohellenic.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gfsneohellenic.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gfsneohellenic.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gfsneohellenic
 if [ $1 == 0 ] ; then
-sed -i '/^Map gfsneohellenic.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gfsneohellenic.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -62059,7 +61955,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(gpsolomos.enc) = %{tl_version}
 Provides: tex(gfssolomos.map) = %{tl_version}
@@ -62082,15 +61978,14 @@ date: 2008-08-19 21:00:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gfssolomos.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gfssolomos.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gfssolomos.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gfssolomos
 if [ $1 == 0 ] ; then
-sed -i '/^Map gfssolomos.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gfssolomos.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -62286,7 +62181,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(yfrak.map) = %{tl_version}
 Provides: tex(cmfrak.tfm) = %{tl_version}
@@ -62324,15 +62219,14 @@ date: 2009-01-16 17:12:15 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map yfrak.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yfrak.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=yfrak.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gothic
 if [ $1 == 0 ] ; then
-sed -i '/^Map yfrak.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yfrak.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -62420,7 +62314,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(ugq.map) = %{tl_version}
 Provides: tex(ugqb.tfm) = %{tl_version}
@@ -62460,15 +62354,14 @@ date: 2007-11-03 13:04:21 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ugq.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ugq.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ugq.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun grotesq
 if [ $1 == 0 ] ; then
-sed -i '/^Map ugq.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ugq.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -62504,7 +62397,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(hacm.map) = %{tl_version}
 Provides: tex(alblant.tfm) = %{tl_version}
@@ -62563,15 +62456,14 @@ date: 2012-09-10 11:33:53 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map hacm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map hacm.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=hacm.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun hacm
 if [ $1 == 0 ] ; then
-sed -i '/^Map hacm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=hacm.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -62647,7 +62539,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(hfmital.enc) = %{tl_version}
 Provides: tex(hfmsa.enc) = %{tl_version}
@@ -62690,15 +62582,14 @@ date: 2012-07-13 13:47:30 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap hfbright.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap hfbright.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=hfbright.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun hfbright
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap hfbright.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=hfbright.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -63508,7 +63399,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(textcomp.sty)
 Requires: tex(keyval.sty)
@@ -63547,15 +63438,14 @@ date: 2010-09-07 15:05:43 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map fi4.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map fi4.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=fi4.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun inconsolata
 if [ $1 == 0 ] ; then
-sed -i '/^Map fi4.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=fi4.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -63591,7 +63481,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(Acorn.map) = %{tl_version}
 Provides: tex(AnnSton.map) = %{tl_version}
@@ -63696,81 +63586,58 @@ date: 2008-08-19 23:32:24 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map Acorn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Acorn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map AnnSton.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map AnnSton.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map ArtNouv.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ArtNouv.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map ArtNouvc.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ArtNouvc.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Carrickc.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Carrickc.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Eichenla.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Eichenla.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Eileen.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Eileen.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map EileenBl.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map EileenBl.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Elzevier.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Elzevier.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map GotIn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map GotIn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map GoudyIn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map GoudyIn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Kinigcap.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Kinigcap.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Konanur.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Konanur.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Kramer.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Kramer.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map MorrisIn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map MorrisIn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Nouveaud.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Nouveaud.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Romantik.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Romantik.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Rothdn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Rothdn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map RoyalIn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map RoyalIn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Sanremo.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Sanremo.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Starburst.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Starburst.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Typocaps.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Typocaps.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map Zallman.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Zallman.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=Acorn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=AnnSton.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=ArtNouv.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=ArtNouvc.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Carrickc.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Eichenla.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Eileen.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=EileenBl.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Elzevier.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=GotIn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=GoudyIn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Kinigcap.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Konanur.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Kramer.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=MorrisIn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Nouveaud.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Romantik.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Rothdn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=RoyalIn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Sanremo.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Starburst.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Typocaps.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=Zallman.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun initials
 if [ $1 == 0 ] ; then
-sed -i '/^Map Acorn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map AnnSton.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map ArtNouv.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map ArtNouvc.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Carrickc.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Eichenla.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Eileen.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map EileenBl.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Elzevier.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map GotIn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map GoudyIn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Kinigcap.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Konanur.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Kramer.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map MorrisIn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Nouveaud.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Romantik.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Rothdn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map RoyalIn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Sanremo.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Starburst.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Typocaps.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map Zallman.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Acorn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=AnnSton.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ArtNouv.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ArtNouvc.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Carrickc.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Eichenla.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Eileen.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=EileenBl.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Elzevier.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=GotIn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=GoudyIn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Kinigcap.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Konanur.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Kramer.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=MorrisIn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Nouveaud.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Romantik.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Rothdn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=RoyalIn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Sanremo.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Starburst.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Typocaps.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Zallman.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -63806,7 +63673,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(ipaex-type1.map) = %{tl_version}
 Provides: tex(ipxg-r-ot1.tfm) = %{tl_version}
@@ -64663,15 +64530,14 @@ date: 2013-05-18 17:41:16 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ipaex-type1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ipaex-type1.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ipaex-type1.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun ipaex-type1
 if [ $1 == 0 ] ; then
-sed -i '/^Map ipaex-type1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ipaex-type1.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -64707,7 +64573,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cs-iwona-sc.enc) = %{tl_version}
 Provides: tex(cs-iwona.enc) = %{tl_version}
@@ -65312,15 +65178,14 @@ date: 2010-08-03 20:49:06 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map iwona.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map iwona.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=iwona.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun iwona
 if [ $1 == 0 ] ; then
-sed -i '/^Map iwona.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=iwona.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -65709,7 +65574,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(textcomp.sty)
 Requires: tex(amsmath.sty)
@@ -67597,15 +67462,14 @@ date: 2012-07-05 15:28:28 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map kpfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map kpfonts.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=kpfonts.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun kpfonts
 if [ $1 == 0 ] ; then
-sed -i '/^Map kpfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=kpfonts.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -67641,7 +67505,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cs-kurier-sc.enc) = %{tl_version}
 Provides: tex(cs-kurier.enc) = %{tl_version}
@@ -68244,15 +68108,14 @@ date: 2010-08-03 20:49:06 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map kurier.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map kurier.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=kurier.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun kurier
 if [ $1 == 0 ] ; then
-sed -i '/^Map kurier.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=kurier.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -68288,7 +68151,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Requires: tex(slantsc.sty)
@@ -68478,15 +68341,14 @@ date: 2011-12-31 13:07:31 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map lato.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map lato.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=lato.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun lato
 if [ $1 == 0 ] ; then
-sed -i '/^Map lato.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=lato.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -68594,7 +68456,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(textcomp.sty)
@@ -70027,15 +69889,14 @@ date: 2013-02-13 18:18:56 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map libertine.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map libertine.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=libertine.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun libertine
 if [ $1 == 0 ] ; then
-sed -i '/^Map libertine.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=libertine.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -70071,7 +69932,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(ifxetex.sty)
 Requires: tex(ifluatex.sty)
@@ -70188,15 +70049,14 @@ date: 2013-01-28 07:51:38 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map LibreBaskerville.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map LibreBaskerville.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=LibreBaskerville.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun librebaskerville
 if [ $1 == 0 ] ; then
-sed -i '/^Map LibreBaskerville.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=LibreBaskerville.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -70232,7 +70092,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(fontenc.sty)
 Requires: tex(textcomp.sty)
@@ -70302,15 +70162,14 @@ date: 2010-07-10 19:16:06 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map yly.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yly.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=yly.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun libris
 if [ $1 == 0 ] ; then
-sed -i '/^Map yly.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yly.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -70349,7 +70208,7 @@ Obsoletes: texlive-linearA < %{tl_version}.1
 Obsoletes: texlive-linearA-fedora-fonts < %{tl_version}.1
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xspace.sty)
 Provides: tex(linearA.map) = %{tl_version}
@@ -70373,15 +70232,14 @@ date: 2006-12-01 16:33:32 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map linearA.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map linearA.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=linearA.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun lineara
 if [ $1 == 0 ] ; then
-sed -i '/^Map linearA.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=linearA.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -70417,7 +70275,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(lxfonts.map) = %{tl_version}
 Provides: tex(lcmbsy8.tfm) = %{tl_version}
@@ -70477,15 +70335,14 @@ date: 2008-08-22 10:50:40 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap lxfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap lxfonts.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=lxfonts.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun lxfonts
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap lxfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=lxfonts.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -70726,7 +70583,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-mathabx
 Provides: tex(mathabx.map) = %{tl_version}
@@ -70765,15 +70622,14 @@ date: 2011-01-19 07:58:01 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map mathabx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mathabx.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=mathabx.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun mathabx-type1
 if [ $1 == 0 ] ; then
-sed -i '/^Map mathabx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mathabx.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -70810,7 +70666,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Requires: tex(ifthen.sty)
@@ -71344,21 +71200,18 @@ date: 2010-07-13 13:53:59 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map mdbch.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mdbch.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map mdput.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mdput.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map mdugm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mdugm.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=mdbch.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=mdput.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=mdugm.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun mathdesign
 if [ $1 == 0 ] ; then
-sed -i '/^Map mdbch.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map mdput.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map mdugm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mdbch.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mdput.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mdugm.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -71457,7 +71310,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(amsmath.sty)
@@ -71537,15 +71390,14 @@ date: 2012-11-29 15:59:01 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map mdsymbol.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mdsymbol.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=mdsymbol.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun mdsymbol
 if [ $1 == 0 ] ; then
-sed -i '/^Map mdsymbol.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mdsymbol.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -71581,7 +71433,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(textcomp.sty)
 Requires: tex(eufrak.sty)
@@ -71744,15 +71596,14 @@ date: 2008-08-22 15:19:59 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map MnSymbol.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map MnSymbol.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=MnSymbol.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun mnsymbol
 if [ $1 == 0 ] ; then
-sed -i '/^Map MnSymbol.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=MnSymbol.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -71788,7 +71639,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(amsmath.sty)
 Requires: tex(xkeyval.sty)
@@ -72133,15 +71984,14 @@ date: 2013-05-27 20:07:27 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map newpx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map newpx.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=newpx.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun newpx
 if [ $1 == 0 ] ; then
-sed -i '/^Map newpx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=newpx.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -72177,7 +72027,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(amsmath.sty)
 Requires: tex(xkeyval.sty)
@@ -72554,15 +72404,14 @@ date: 2013-05-20 11:34:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map newtx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map newtx.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=newtx.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun newtx
 if [ $1 == 0 ] ; then
-sed -i '/^Map newtx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=newtx.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -72649,7 +72498,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(cherokee.map) = %{tl_version}
 Provides: tex(Cherokee.tfm) = %{tl_version}
@@ -72672,15 +72521,14 @@ date: 2007-03-12 00:37:02 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cherokee.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cherokee.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cherokee.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun ocherokee
 if [ $1 == 0 ] ; then
-sed -i '/^Map cherokee.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cherokee.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -72770,7 +72618,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(ocrb.map) = %{tl_version}
 Provides: tex(ocrb10.otf) = %{tl_version}
@@ -72798,15 +72646,14 @@ date: 2011-01-07 10:11:51 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ocrb.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ocrb.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ocrb.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun ocr-b-outline
 if [ $1 == 0 ] ; then
-sed -i '/^Map ocrb.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ocrb.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -72896,7 +72743,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(oinuit.map) = %{tl_version}
 Provides: tex(Inuit.tfm) = %{tl_version}
@@ -72923,15 +72770,14 @@ date: 2012-06-16 10:52:26 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map oinuit.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map oinuit.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=oinuit.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun oinuit
 if [ $1 == 0 ] ; then
-sed -i '/^Map oinuit.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=oinuit.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -73121,7 +72967,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Requires: tex(slantsc.sty)
@@ -73931,15 +73777,14 @@ date: 2011-11-30 18:37:09 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map opensans.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map opensans.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=opensans.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun opensans
 if [ $1 == 0 ] ; then
-sed -i '/^Map opensans.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=opensans.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -74086,7 +73931,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Provides: tex(ptmono_il2.enc) = %{tl_version}
@@ -74787,15 +74632,14 @@ date: 2013-05-21 15:19:45 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map paratype-type1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map paratype-type1.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=paratype-type1.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun paratype
 if [ $1 == 0 ] ; then
-sed -i '/^Map paratype-type1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=paratype-type1.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -74831,7 +74675,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(phaistos.map) = %{tl_version}
 Provides: tex(Phaistos.otf) = %{tl_version}
@@ -74856,15 +74700,14 @@ date: 2008-07-09 12:34:16 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map phaistos.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map phaistos.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=phaistos.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun phaistos
 if [ $1 == 0 ] ; then
-sed -i '/^Map phaistos.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=phaistos.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -74963,7 +74806,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(pigpen.map) = %{tl_version}
 Provides: tex(pigpen.tfm) = %{tl_version}
@@ -74984,15 +74827,14 @@ date: 2008-12-10 19:58:48 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap pigpen.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap pigpen.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=pigpen.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun pigpen
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap pigpen.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=pigpen.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -75028,7 +74870,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(ap-cs-sc.enc) = %{tl_version}
 Provides: tex(ap-cs.enc) = %{tl_version}
@@ -75785,15 +75627,14 @@ date: 2010-10-12 09:30:05 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map ap.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map ap.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=ap.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun poltawski
 if [ $1 == 0 ] ; then
-sed -i '/^Map ap.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=ap.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -75829,7 +75670,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(prodint.map) = %{tl_version}
 Provides: tex(prodint.tfm) = %{tl_version}
@@ -75850,15 +75691,14 @@ date: 2011-03-30 12:07:52 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map prodint.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map prodint.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=prodint.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun prodint
 if [ $1 == 0 ] ; then
-sed -i '/^Map prodint.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=prodint.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -76064,7 +75904,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Provides: tex(pxtx.map) = %{tl_version}
@@ -76107,15 +75947,14 @@ date: 2011-08-23 14:32:14 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map pxtx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map pxtx.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=pxtx.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun pxtxalfa
 if [ $1 == 0 ] ; then
-sed -i '/^Map pxtx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=pxtx.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -76151,7 +75990,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(ifxetex.sty)
 Requires: tex(ifluatex.sty)
@@ -76410,15 +76249,14 @@ date: 2012-11-26 01:49:31 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map quattrocento.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map quattrocento.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=quattrocento.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun quattrocento
 if [ $1 == 0 ] ; then
-sed -i '/^Map quattrocento.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=quattrocento.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -76454,7 +76292,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(fontenc.sty)
 Requires: tex(textcomp.sty)
@@ -77040,15 +76878,14 @@ date: 2013-05-02 20:57:12 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map Raleway.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map Raleway.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=Raleway.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun raleway
 if [ $1 == 0 ] ; then
-sed -i '/^Map Raleway.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=Raleway.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -77084,7 +76921,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(recycle.map) = %{tl_version}
 Provides: tex(recycle.tfm) = %{tl_version}
@@ -77102,15 +76939,14 @@ date: 2009-11-10 00:30:52 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map recycle.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map recycle.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=recycle.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun recycle
 if [ $1 == 0 ] ; then
-sed -i '/^Map recycle.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=recycle.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -77146,7 +76982,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(fontenc.sty)
@@ -77250,15 +77086,14 @@ date: 2010-07-14 23:31:19 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map yrd.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yrd.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=yrd.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun romande
 if [ $1 == 0 ] ; then
-sed -i '/^Map yrd.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yrd.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -77294,7 +77129,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Provides: tex(rsfso.map) = %{tl_version}
@@ -77323,15 +77158,14 @@ date: 2011-02-18 16:44:14 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map rsfso.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map rsfso.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=rsfso.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun rsfso
 if [ $1 == 0 ] ; then
-sed -i '/^Map rsfso.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=rsfso.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -77367,7 +77201,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(filehook.sty)
 Provides: tex(sansmathaccent.map) = %{tl_version}
@@ -77401,15 +77235,14 @@ date: 2013-04-30 15:48:45 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map sansmathaccent.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map sansmathaccent.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=sansmathaccent.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun sansmathaccent
 if [ $1 == 0 ] ; then
-sed -i '/^Map sansmathaccent.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=sansmathaccent.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -77445,7 +77278,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(sansmathfonts.map) = %{tl_version}
 Provides: tex(cmsmf10.tfm) = %{tl_version}
@@ -77810,15 +77643,14 @@ date: 2013-04-28 19:53:22 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map sansmathfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map sansmathfonts.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=sansmathfonts.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun sansmathfonts
 if [ $1 == 0 ] ; then
-sed -i '/^Map sansmathfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=sansmathfonts.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -78056,7 +77888,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(smfb10.enc) = %{tl_version}
 Provides: tex(smfbsl10.enc) = %{tl_version}
@@ -78135,15 +77967,14 @@ date: 2008-04-15 09:54:26 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap semaf.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap semaf.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=semaf.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun semaphor
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap semaf.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=semaf.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -78219,7 +78050,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(fontenc.sty)
 Requires: tex(textcomp.sty)
@@ -78488,15 +78319,14 @@ date: 2013-01-17 13:28:12 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map SourceCodePro.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map SourceCodePro.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=SourceCodePro.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun sourcecodepro
 if [ $1 == 0 ] ; then
-sed -i '/^Map SourceCodePro.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=SourceCodePro.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -78532,7 +78362,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(fontenc.sty)
 Requires: tex(textcomp.sty)
@@ -79311,15 +79141,14 @@ date: 2013-05-02 20:50:09 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map SourceSansPro.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map SourceSansPro.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=SourceSansPro.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun sourcesanspro
 if [ $1 == 0 ] ; then
-sed -i '/^Map SourceSansPro.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=SourceSansPro.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -79355,7 +79184,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(starfont.map) = %{tl_version}
 Provides: tex(fstr8x.tfm) = %{tl_version}
@@ -79377,15 +79206,14 @@ date: 2010-09-30 00:35:45 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map starfont.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map starfont.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=starfont.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun starfont
 if [ $1 == 0 ] ; then
-sed -i '/^Map starfont.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=starfont.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -79421,7 +79249,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(icelandic.map) = %{tl_version}
 Provides: tex(icelandic.tfm) = %{tl_version}
@@ -79440,15 +79268,14 @@ date: 2008-08-23 15:48:35 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map icelandic.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map icelandic.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=icelandic.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun staves
 if [ $1 == 0 ] ; then
-sed -i '/^Map icelandic.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=icelandic.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -79565,7 +79392,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Provides: tex(sups.enc) = %{tl_version}
@@ -79587,15 +79414,14 @@ date: 2013-02-18 23:06:04 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map superiors.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map superiors.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=superiors.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun superiors
 if [ $1 == 0 ] ; then
-sed -i '/^Map superiors.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=superiors.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -79812,7 +79638,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(tfrupee.map) = %{tl_version}
 Provides: tex(tfrupee.tfm) = %{tl_version}
@@ -79831,15 +79657,14 @@ date: 2010-12-16 15:42:40 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map tfrupee.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map tfrupee.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=tfrupee.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun tfrupee
 if [ $1 == 0 ] ; then
-sed -i '/^Map tfrupee.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=tfrupee.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -79946,7 +79771,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(trajan.map) = %{tl_version}
 Provides: tex(trjnr10.tfm) = %{tl_version}
@@ -79970,15 +79795,14 @@ date: 2007-10-24 18:05:15 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap trajan.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap trajan.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=trajan.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun trajan
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap trajan.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=trajan.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -80014,7 +79838,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(txfonts.sty)
 Provides: tex(gptimes.enc) = %{tl_version}
@@ -80087,15 +79911,14 @@ date: 2011-03-01 17:09:11 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gptimes.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gptimes.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gptimes.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun txfontsb
 if [ $1 == 0 ] ; then
-sed -i '/^Map gptimes.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gptimes.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -80330,7 +80153,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
 Requires: tex(fontenc.sty)
@@ -80994,27 +80817,22 @@ date: 2010-07-12 22:26:03 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map yv1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yv1.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map yv2.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yv2.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map yv3.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yv3.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map yvo.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yvo.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map yvt.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map yvt.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=yv1.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=yv2.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=yv3.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=yvo.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=yvt.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun venturisadf
 if [ $1 == 0 ] ; then
-sed -i '/^Map yv1.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map yv2.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map yv3.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map yvo.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map yvt.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yv1.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yv2.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yv3.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yvo.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=yvt.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -81623,7 +81441,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(eurosym.map) = %{tl_version}
 Provides: tex(feybl10.tfm) = %{tl_version}
@@ -81659,15 +81477,14 @@ date: 2009-03-31 14:27:12 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap eurosym.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap eurosym.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=eurosym.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun eurosym
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap eurosym.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=eurosym.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -82052,7 +81869,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(marvosym.map) = %{tl_version}
 Provides: tex(umvs.tfm) = %{tl_version}
@@ -82077,15 +81894,14 @@ date: 2012-04-08 13:55:52 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map marvosym.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map marvosym.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=marvosym.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun marvosym
 if [ $1 == 0 ] ; then
-sed -i '/^Map marvosym.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=marvosym.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -82641,7 +82457,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(pxfonts.map) = %{tl_version}
 Provides: tex(pxr.map) = %{tl_version}
@@ -82805,15 +82621,14 @@ date: 2009-01-15 09:33:18 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map pxfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map pxfonts.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=pxfonts.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun pxfonts
 if [ $1 == 0 ] ; then
-sed -i '/^Map pxfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=pxfonts.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -82849,7 +82664,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(rsfs.map) = %{tl_version}
 Provides: tex(rsfs10.tfm) = %{tl_version}
@@ -82875,15 +82690,14 @@ date: 2008-12-14 19:11:27 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap rsfs.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap rsfs.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=rsfs.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun rsfs
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap rsfs.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=rsfs.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -82972,7 +82786,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(tgcursor.sty)
 Requires: tex(tgheros.sty)
@@ -83760,36 +83574,28 @@ date: 2009-11-12 13:33:47 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map qag.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map qag.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map qbk.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map qbk.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map qcr.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map qcr.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map qcs.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map qcs.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map qhv.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map qhv.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map qpl.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map qpl.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map qtm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map qtm.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map qzc.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map qzc.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=qag.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=qbk.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=qcr.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=qcs.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=qhv.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=qpl.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=qtm.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=qzc.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun tex-gyre
 if [ $1 == 0 ] ; then
-sed -i '/^Map qag.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map qbk.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map qcr.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map qcs.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map qhv.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map qpl.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map qtm.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map qzc.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=qag.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=qbk.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=qcr.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=qcs.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=qhv.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=qpl.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=qtm.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=qzc.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -84117,7 +83923,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(tipx.sty)
 Requires: tex(fontenc.sty)
@@ -84297,15 +84103,14 @@ date: 2012-01-30 10:59:21 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap tipa.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap tipa.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=tipa.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun tipa
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap tipa.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=tipa.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -84341,7 +84146,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(tx8r.enc) = %{tl_version}
 Provides: tex(txfonts.map) = %{tl_version}
@@ -84627,15 +84432,14 @@ date: 2009-01-15 09:33:18 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map txfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map txfonts.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=txfonts.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun txfonts
 if [ $1 == 0 ] ; then
-sed -i '/^Map txfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=txfonts.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -84777,7 +84581,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(wasy.map) = %{tl_version}
 Provides: tex(wasy10.tfm) = %{tl_version}
@@ -84808,15 +84612,14 @@ date: 2006-09-12 08:29:26 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap wasy.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap wasy.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=wasy.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun wasy
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap wasy.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=wasy.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -85834,7 +85637,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires(post,postun): /sbin/install-info
 Requires: tex-pdftex
@@ -85920,7 +85723,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-latex
 Requires: texlive-mltex-bin
@@ -86102,7 +85905,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-tex
 Requires: texlive-texsis-bin
@@ -90059,7 +89862,7 @@ Provides: jadetex = %{tl_version}
 Obsoletes: jadetex < %{tl_version}
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-latex
 Requires: tex-pdftex
@@ -90278,7 +90081,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-latex
 Requires: tex-pdftex
@@ -92545,7 +92348,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(ethiop.map) = %{tl_version}
 Provides: tex(etha10.pfb) = %{tl_version}
@@ -92603,15 +92406,14 @@ date: 2007-02-14 08:57:40 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap ethiop.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap ethiop.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=ethiop.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun ethiop-t1
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap ethiop.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=ethiop.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -92912,7 +92714,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -93051,7 +92853,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -93099,7 +92901,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -93636,7 +93438,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -93792,7 +93594,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(otf.sty)
 Provides: tex(otf-cktx.map) = %{tl_version}
@@ -95907,18 +95709,16 @@ date: 2013-04-14 10:19:50 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^KanjiMap otf-cktx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "KanjiMap otf-cktx.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^KanjiMap otf-@kanjiEmbed@.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "KanjiMap otf-@kanjiEmbed@.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable KanjiMap=otf-cktx.map  > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable KanjiMap=otf-@kanjiEmbed@.map  > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun japanese-otf
 if [ $1 == 0 ] ; then
-sed -i '/^KanjiMap otf-cktx.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^KanjiMap otf-@kanjiEmbed@.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable KanjiMap=otf-cktx.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable KanjiMap=otf-@kanjiEmbed@.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -95954,7 +95754,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-japanese-otf
 Requires: tex(mlcid.sty)
@@ -96759,15 +96559,14 @@ date: 2013-04-14 10:19:50 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^KanjiMap otf-up-@kanjiEmbed@.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "KanjiMap otf-up-@kanjiEmbed@.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable KanjiMap=otf-up-@kanjiEmbed@.map  > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun japanese-otf-uptex
 if [ $1 == 0 ] ; then
-sed -i '/^KanjiMap otf-up-@kanjiEmbed@.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable KanjiMap=otf-up-@kanjiEmbed@.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -97127,7 +96926,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(nanumfonts.map) = %{tl_version}
 Provides: tex(nanumgtb00.tfm) = %{tl_version}
@@ -98448,15 +98247,14 @@ date: 2013-03-25 18:47:44 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map nanumfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map nanumfonts.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=nanumfonts.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun nanumtype1
 if [ $1 == 0 ] ; then
-sed -i '/^Map nanumfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=nanumfonts.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -98492,7 +98290,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-tex
 Requires: tex-latex
@@ -98703,10 +98501,8 @@ if [ $1 -gt 0 ] ; then
 sed -i 's/^\#\!\ ptex.*$/ptex ptex - ptex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
 sed -i 's/^\#\!\ eptex.*$/eptex eptex language.def *eptex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
 sed -i 's/^\#\!\ platex.*$/platex eptex language.dat *platex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
-sed -i '/^KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^KanjiMap morisawa.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "KanjiMap morisawa.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable KanjiMap=ptex-@kanjiEmbed@@kanjiVariant@.map  > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable KanjiMap=morisawa.map  > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 touch /var/run/texlive/run-fmtutil
 fi
@@ -98717,8 +98513,8 @@ if [ $1 == 0 ] ; then
 sed -i 's/^ptex.*$/\#\!\ ptex ptex - ptex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
 sed -i 's/^eptex.*$/\#\!\ eptex eptex language.def *eptex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
 sed -i 's/^platex.*$/\#\!\ platex eptex language.dat *platex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
-sed -i '/^KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^KanjiMap morisawa.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable KanjiMap=ptex-@kanjiEmbed@@kanjiVariant@.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable KanjiMap=morisawa.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -99068,7 +98864,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-ptex
 Requires: tex-hyph-utf8
@@ -99196,8 +98992,7 @@ if [ $1 -gt 0 ] ; then
 sed -i 's/^\#\!\ uptex.*$/uptex uptex - uptex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
 sed -i 's/^\#\!\ euptex.*$/euptex euptex language.def *euptex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
 sed -i 's/^\#\!\ uplatex.*$/uplatex euptex language.dat *uplatex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf
-sed -i '/^KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable KanjiMap=uptex-@kanjiEmbed@@kanjiVariant@.map  > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 touch /var/run/texlive/run-fmtutil
 fi
@@ -99208,7 +99003,7 @@ if [ $1 == 0 ] ; then
 sed -i 's/^uptex.*$/\#\!\ uptex uptex - uptex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
 sed -i 's/^euptex.*$/\#\!\ euptex euptex language.def *euptex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
 sed -i 's/^uplatex.*$/\#\!\ uplatex euptex language.dat *uplatex.ini/' %{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1
-sed -i '/^KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable KanjiMap=uptex-@kanjiEmbed@@kanjiVariant@.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -105150,7 +104945,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -105198,7 +104993,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -105254,7 +105049,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -105372,7 +105167,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -105433,7 +105228,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -106493,7 +106288,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-cbfonts
 Requires: tex(ifthen.sty)
@@ -106708,15 +106503,14 @@ date: 2012-07-07 22:27:26 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap mongolian.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap mongolian.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=mongolian.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun montex
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap mongolian.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=mongolian.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -106979,7 +106773,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(amssymb.sty)
 Requires: tex(enumerate.sty)
@@ -107106,7 +106900,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(xl2.enc) = %{tl_version}
 Provides: tex(xt2.enc) = %{tl_version}
@@ -107376,18 +107170,16 @@ date: 2012-04-25 13:09:32 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map cs-charter.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cs-charter.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map csfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map csfonts.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=cs-charter.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=csfonts.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun cs
 if [ $1 == 0 ] ; then
-sed -i '/^Map cs-charter.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map csfonts.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cs-charter.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=csfonts.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -107475,7 +107267,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-latex
 Requires: texlive-cslatex-bin
@@ -107571,7 +107363,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-tex
 Requires: texlive-csplain-bin
@@ -107689,7 +107481,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -107739,7 +107531,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -107944,7 +107736,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -108846,7 +108638,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -108894,7 +108686,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -108944,7 +108736,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -108994,7 +108786,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109045,7 +108837,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109093,7 +108885,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109143,7 +108935,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109194,7 +108986,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109257,7 +109049,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109308,7 +109100,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109358,7 +109150,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109408,7 +109200,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109463,7 +109255,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109511,7 +109303,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109560,7 +109352,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109627,7 +109419,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109677,7 +109469,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109728,7 +109520,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109778,7 +109570,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109833,7 +109625,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109881,7 +109673,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109937,7 +109729,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -109986,7 +109778,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -110034,7 +109826,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(latin7x.enc) = %{tl_version}
 Provides: tex(l7x-urwvn.map) = %{tl_version}
@@ -110103,15 +109895,14 @@ date: 2008-11-06 00:30:15 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map l7x-urwvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map l7x-urwvn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=l7x-urwvn.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun lithuanian
 if [ $1 == 0 ] ; then
-sed -i '/^Map l7x-urwvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=l7x-urwvn.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -110596,7 +110387,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -110646,7 +110437,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -110852,7 +110643,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(array.sty)
 Requires: tex(colortbl.sty)
@@ -110876,15 +110667,14 @@ date: 2013-01-22 17:38:01 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map tabvar.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map tabvar.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=tabvar.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun tabvar
 if [ $1 == 0 ] ; then
-sed -i '/^Map tabvar.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=tabvar.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -111150,7 +110940,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -111506,7 +111296,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -111995,7 +111785,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(gpgfsbaskerville.enc) = %{tl_version}
 Provides: tex(gfsbaskerville.map) = %{tl_version}
@@ -112019,15 +111809,14 @@ date: 2008-08-19 21:00:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gfsbaskerville.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gfsbaskerville.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gfsbaskerville.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gfsbaskerville
 if [ $1 == 0 ] ; then
-sed -i '/^Map gfsbaskerville.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gfsbaskerville.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -112063,7 +111852,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(porsonel.enc) = %{tl_version}
 Provides: tex(gfsporson.map) = %{tl_version}
@@ -112088,15 +111877,14 @@ date: 2008-08-19 21:00:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map gfsporson.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map gfsporson.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=gfsporson.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun gfsporson
 if [ $1 == 0 ] ; then
-sed -i '/^Map gfsporson.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=gfsporson.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -112342,7 +112130,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -112421,7 +112209,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -112538,7 +112326,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(IbycusHTG.enc) = %{tl_version}
 Provides: tex(iby.map) = %{tl_version}
@@ -112581,15 +112369,14 @@ date: 2007-07-29 11:26:52 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap iby.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap iby.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=iby.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun ibygrk
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap iby.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=iby.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -112625,7 +112412,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(txfonts.sty)
 Provides: tex(gkerkis.enc) = %{tl_version}
@@ -112890,15 +112677,14 @@ date: 2009-01-15 17:16:29 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map kerkis.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map kerkis.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=kerkis.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun kerkis
 if [ $1 == 0 ] ; then
-sed -i '/^Map kerkis.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=kerkis.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -113466,7 +113252,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -113576,7 +113362,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -113626,7 +113412,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(relsize.sty)
 Requires: tex(ifthen.sty)
@@ -113661,15 +113447,14 @@ date: 2007-01-14 10:43:12 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map skt.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map skt.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=skt.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun sanskrit
 if [ $1 == 0 ] ; then
-sed -i '/^Map skt.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=skt.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -113705,7 +113490,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-xetex-devanagari
 Requires: tex(hindicaptions.sty)
@@ -113862,15 +113647,14 @@ date: 2011-07-25 14:21:08 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap dvng.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap dvng.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=dvng.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun velthuis
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap dvng.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=dvng.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -114232,7 +114016,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114544,7 +114328,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114595,7 +114379,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114646,7 +114430,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114698,7 +114482,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114747,7 +114531,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114797,7 +114581,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114845,7 +114629,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114893,7 +114677,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -114974,7 +114758,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(ifthen.sty)
 Requires: tex(ucs.sty)
@@ -115350,42 +115134,32 @@ date: 2013-05-19 14:33:40 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map arevvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map arevvn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map chartervn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map chartervn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map cmbrightvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map cmbrightvn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map concretevn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map concretevn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map grotesqvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map grotesqvn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map txttvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map txttvn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map urwvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map urwvn.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap vnrother.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap vnrother.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap vnrtext.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap vnrtext.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^Map vntopia.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map vntopia.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=arevvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=chartervn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=cmbrightvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=concretevn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=grotesqvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=txttvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=urwvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=vnrother.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=vnrtext.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable Map=vntopia.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun vntex
 if [ $1 == 0 ] ; then
-sed -i '/^Map arevvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map chartervn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map cmbrightvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map concretevn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map grotesqvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map txttvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map urwvn.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap vnrother.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap vnrtext.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^Map vntopia.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=arevvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=chartervn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=cmbrightvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=concretevn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=grotesqvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=txttvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=urwvn.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=vnrother.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=vnrtext.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=vntopia.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -115526,7 +115300,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -115589,7 +115363,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-pl
 Requires: tex-hyphen-polish
@@ -115664,7 +115438,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(plin.enc) = %{tl_version}
 Provides: tex(plit.enc) = %{tl_version}
@@ -115852,18 +115626,16 @@ date: 2009-10-07 21:35:42 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap plother.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap plother.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
-sed -i '/^MixedMap pltext.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap pltext.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=plother.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --quiet --enable MixedMap=pltext.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun pl
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap plother.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
-sed -i '/^MixedMap pltext.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=plother.map > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=pltext.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -116327,7 +116099,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -116503,7 +116275,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -116551,7 +116323,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -116599,7 +116371,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-hyphen-base
 Requires: tex-hyph-utf8
@@ -122341,7 +122113,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(color.sty)
 Provides: tex(knitfont.map) = %{tl_version}
@@ -122393,15 +122165,14 @@ date: 2010-08-29 22:20:17 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map knitfont.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map knitfont.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=knitfont.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun knitting
 if [ $1 == 0 ] ; then
-sed -i '/^Map knitfont.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=knitfont.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -126788,7 +126559,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(keyval.sty)
 Requires: tex(ifpdf.sty)
@@ -126915,15 +126686,14 @@ xypic package
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap xypic.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap xypic.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=xypic.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun xypic
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap xypic.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=xypic.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -134076,7 +133846,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(epiolmec.map) = %{tl_version}
 Provides: tex(EpiOlmec.tfm) = %{tl_version}
@@ -134094,15 +133864,14 @@ date: 2007-02-06 22:00:42 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map epiolmec.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map epiolmec.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=epiolmec.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun epiolmec
 if [ $1 == 0 ] ; then
-sed -i '/^Map epiolmec.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=epiolmec.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -134563,7 +134332,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex-esint
 Provides: tex(esint.map) = %{tl_version}
@@ -134584,15 +134353,14 @@ date: 2008-01-16 21:31:11 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap esint.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap esint.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=esint.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun esint-type1
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap esint.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=esint.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -146528,7 +146296,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(manfnt.map) = %{tl_version}
 Provides: tex(manfnt.pfb) = %{tl_version}
@@ -146545,15 +146313,14 @@ date: 2007-01-02 14:43:33 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap manfnt.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap manfnt.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=manfnt.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun manfnt
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap manfnt.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=manfnt.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -174510,7 +174277,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Requires: tex(amsmath.sty)
 Provides: tex(yhmath.map) = %{tl_version}
@@ -174531,15 +174298,14 @@ date: 2007-03-01 23:46:20 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap yhmath.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap yhmath.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=yhmath.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun yhmath
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap yhmath.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=yhmath.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -176747,7 +176513,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(musix.map) = %{tl_version}
 Provides: tex(musix11.tfm) = %{tl_version}
@@ -176911,15 +176677,14 @@ date: 2013-01-24 16:57:55 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^MixedMap musix.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "MixedMap musix.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable MixedMap=musix.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun musixtex-fnts
 if [ $1 == 0 ] ; then
-sed -i '/^MixedMap musix.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable MixedMap=musix.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -177162,7 +176927,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(mxedruli.map) = %{tl_version}
 Provides: tex(mxed10.tfm) = %{tl_version}
@@ -177190,15 +176955,14 @@ date: 2013-04-18 13:20:04 +0200
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map mxedruli.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map mxedruli.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=mxedruli.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun mxedruli
 if [ $1 == 0 ] ; then
-sed -i '/^Map mxedruli.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=mxedruli.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -189128,7 +188892,7 @@ AutoReqProv: No
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
-Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base
+Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
 Provides: tex(chemarrow.map) = %{tl_version}
 Provides: tex(arrow.tfm) = %{tl_version}
@@ -189147,15 +188911,14 @@ date: 2010-02-21 18:58:04 +0100
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 if [ $1 -gt 0 ] ; then
-sed -i '/^Map chemarrow.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg
-echo "Map chemarrow.map" >> %{_texdir}/texmf-dist/web2c/updmap.cfg
+%{_bindir}/updmap-sys --quiet --enable Map=chemarrow.map > /dev/null 2>&1
 touch /var/run/texlive/run-updmap
 fi
 :
 
 %postun chemarrow
 if [ $1 == 0 ] ; then
-sed -i '/^Map chemarrow.map/d' %{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1
+%{_bindir}/updmap-sys --disable Map=chemarrow.map > /dev/null 2>&1
 mkdir -p /var/run/texlive
 touch /var/run/texlive/run-texhash
 touch /var/run/texlive/run-mtxrun
@@ -329478,6 +329241,11 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Wed Jun 12 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.1-20130608
+- formally switch to 2013 based on upstream
+- call updmap-sys and fmtutil-sys for map and format updates
+- bump epoch to be sure all noarch packages get updated
+
 * Tue Jun 11 2013 Jon Ciesla <limburgher@gmail.com> - 2012-25-20130531
 - Rebuild for new gd.
 
diff --git a/texlive.spec.template b/texlive.spec.template
index 4acf8ed..be7e183 100644
--- a/texlive.spec.template
+++ b/texlive.spec.template
@@ -1,6 +1,6 @@
-%global source_date 20130531_r30819
-%global tl_version 2012
-%global tl_rel 24
+%global source_date 20130608_r30832
+%global tl_version 2013
+%global tl_rel 0.1
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -17,7 +17,7 @@
 Name: texlive
 Version: %{tl_version}
 Release: %{tl_release}
-Epoch: 2
+Epoch: 3
 Summary: TeX formatting system
 Group: Applications/Publishing
 License: Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia
@@ -368,6 +368,14 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Wed Jun 12 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.1-20130608
+- formally switch to 2013 based on upstream
+- call updmap-sys and fmtutil-sys for map and format updates
+- bump epoch to be sure all noarch packages get updated
+
+* Tue Jun 11 2013 Jon Ciesla <limburgher@gmail.com> - 2012-25-20130531
+- Rebuild for new gd.
+
 * Sun Jun  2 2013 Jindrich Novy <novyjindrich@gmail.com> - 2012-24-20130531
 - fix luatex breakage (#959625)
 - fix updmap-sys calls (#968573, #968573)
diff --git a/tl2rpm.c b/tl2rpm.c
index 30f4fa4..10b5b1e 100644
--- a/tl2rpm.c
+++ b/tl2rpm.c
@@ -1343,7 +1343,7 @@ void solve(char *name) {
 				fprintf(fpack, REQ_POSTTRANS"texlive-kpathsea-bin, tex-kpathsea\n");
 				if ( pkg[i].exes ) {
 					fprintf(fpack, REQ_POSTTRANS"texlive-tetex-bin, tex-tetex\n");
-					fprintf(fpack, REQ_POST_POSTUN"texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base\n");
+					fprintf(fpack, REQ_POST_POSTUN"texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra\n");
 				}
 				/* require coreutils if there is %post scriptlet present */
 				if ( pkg[i].exes || pkg[i].runfs ) fprintf(fpack, REQ_POST_POSTUN"coreutils\n");
@@ -1568,25 +1568,22 @@ void solve(char *name) {
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
-							fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
-							fprintf(fpack, "echo \"Map %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --enable Map=%s > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
-							fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
-							fprintf(fpack, "echo \"MixedMap %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --enable MixedMap=%s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
-							fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
-							fprintf(fpack, "echo \"KanjiMap %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --enable KanjiMap=%s  > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "BuildFormat ", 12) ) {
-							fprintf(fpack, "sed -i 's/^\\#\\!\\ %s/%s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/fmtutil-sys --enablefmt %s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
 							run_fmtutil = 1;
 							continue;
 						}
@@ -1697,22 +1694,22 @@ void solve(char *name) {
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
-							fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --disable Map=%s > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
-							fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --disable MixedMap=%s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
-							fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --disable KanjiMap=%s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "BuildFormat ", 12) ) {
-							fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s/'  %%{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/fmtutil-sys --disablefmt %s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
 							run_fmtutil = 1;
 							continue;
 						}
@@ -1852,15 +1849,16 @@ void solve(char *name) {
 #ifdef SRPMS
 				mainpkg = 1;
 #endif
+				main_written = 0;
 				append_filelist(pkg[i].name, "", pkg[i].runfs, pkg[i].runf, pkg[i].fedora_license?pkg[i].fedora_license:put_token(pkg[i].catalogue_license, license));
 #ifdef SRPMS
 				mainpkg = 0;
 #endif
 			}
+			main_written = pkg[i].runfs || pkg[i].reqs || pkg[i].exes;
 #ifdef PACKAGE_DOCS
 			/* write doc package if exists */
 			if ( pkg[i].docfs ) {
-				main_written = pkg[i].runfs || pkg[i].reqs || pkg[i].exes;
 				if ( !doc_expanded ) {
 					fprintf(funpack, UNPACK" -dc %%{SOURCE%d} | tar x -C %%{buildroot}%%{_texdir}%s\n", srcno, pkg[i].reloc?"/texmf-dist":"");
 					fprintf(fsrc, "Source%04d: "CTAN_URL"%s.doc.tar."UNPACK"\n", srcno++, name);
@@ -2057,7 +2055,7 @@ void solve(char *name) {
 				fprintf(fpack, "Summary: Binaries for %s\n", name);
 				fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
 				if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n"); //else fprintf(fpack, "Provides: kpathsea = %%{tl_version}\nObsoletes: kpathsea < %%{tl_version}\n");
-				if ( pkg[i].runfs ) fprintf(fpack, "Requires: tex-%s\n", name);
+				if ( main_written ) fprintf(fpack, "Requires: tex-%s\n", name); else printf("!%s\n", name);
 				fprintf(fpack, "Requires: texlive-kpathsea-lib = %%{epoch}:%%{tl_version}-%%{tl_release}\n");
 				if ( !strcmp(name, "xetex") ) {
 					fprintf(fpack, "Requires: teckit\n");
diff --git a/tlpdb.patch b/tlpdb.patch
index 3d7577f..3d60255 100644
--- a/tlpdb.patch
+++ b/tlpdb.patch
@@ -1,5 +1,5 @@
 --- texlive.tlpdb.orig	2013-06-01 08:42:24.769943751 +0200
-+++ texlive.tlpdb	2013-06-01 08:42:24.822944088 +0200
++++ texlive.tlpdb	2013-06-12 14:53:37.749724366 +0200
 @@ -76,7 +76,7 @@
  catalogue-ctan /macros/latex/contrib/abc
  catalogue-date 2008-03-08 20:47:21 +0100