diff --git a/texlive.spec b/texlive.spec index 4a89d0b..e158b77 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,6 +1,6 @@ %global source_date 20160520 %global tl_version 2016 -%global tl_rel 7 +%global tl_rel 8 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -7406,7 +7406,7 @@ Requires(pre): coreutils %description base TeX Live licenses shipped in text form. -%transfiletriggerin -- %{_texdir} +%transfiletriggerin kpathsea -- %{_texdir} %{_bindir}/texhash 2> /dev/null export TEXMF=/usr/share/texlive/texmf-dist export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c @@ -7414,13 +7414,13 @@ export TEXMFCACHE=/var/lib/texmf %{_bindir}/mtxrun --generate &> /dev/null %{_bindir}/fmtutil-sys --all &> /dev/null -%transfiletriggerpostun -- %{_texdir} +%transfiletriggerpostun kpathsea -- %{_texdir} %{_bindir}/texhash 2> /dev/null -%transfiletriggerin -- %{_texdir}/texmf-dist/fonts/map/ +%transfiletriggerin kpathsea -- %{_texdir}/texmf-dist/fonts/map/ while read file; do shortfile = `basename $file` - if `echo $shortfile | grep -Eq 'allrunes.map|arabtex.map|arss.map|artm.map|bbold.map|cbgreek-full.map|ccpl.map|cmextra.map|cmll.map|cm.map|cm-super-t1.map|cm-super-t2a.map|cm-super-t2b.map|cm-super-t2c.map|cm-super-ts1.map|cm-super-x2.map|cmtext-bsr-interpolated.map|cyrillic.map|dvng.map|esint.map|ethiop.map|eurosym.map|hfbright.map|iby.map|latxfont.map|lxfonts.map|manfnt.map|mflogo.map|mongolian.map|musix.map|pigpen.map|plother.map|pltext.map|rsfs.map|semaf.map|stmaryrd.map|symbols.map|tipa.map|trajan.map|vnrother.map|vnrtext.map|wasy.map|xypic.map|yhmath.map'` + if `echo $shortfile | grep -Eq 'allrunes.map|arabtex.map|arss.map|artm.map|bbold.map|cbgreek-full.map|ccpl.map|cmextra.map|cmll.map|cm.map|cm-super-t1.map|cm-super-t2a.map|cm-super-t2b.map|cm-super-t2c.map|cm-super-ts1.map|cm-super-x2.map|cmtext-bsr-interpolated.map|cyrillic.map|dvng.map|esint.map|ethiop.map|eurosym.map|hfbright.map|iby.map|latxfont.map|lxfonts.map|manfnt.map|mflogo.map|mongolian.map|musix.map|pigpen.map|plother.map|pltext.map|rsfs.map|semaf.map|stmaryrd.map|symbols.map|tipa.map|trajan.map|vnrother.map|vnrtext.map|wasy.map|xypic.map|yhmath.map'`; then %{_bindir}/updmap-sys --nomkmap --enable MultiMap=$shortfile > /dev/null 2>&1 else %{_bindir}/updmap-sys --nomkmap --enable Map=$shortfile > /dev/null 2>&1 @@ -7428,10 +7428,10 @@ while read file; do done %{_bindir}/updmap-sys --quiet --nomkmap &> /dev/null -%transfiletriggerpostun -- %{_texdir}/texmf-dist/fonts/map/ +%transfiletriggerpostun kpathsea -- %{_texdir}/texmf-dist/fonts/map/ while read file; do shortfile = `basename $file` - if `echo $shortfile | grep -Eq 'allrunes.map|arabtex.map|arss.map|artm.map|bbold.map|cbgreek-full.map|ccpl.map|cmextra.map|cmll.map|cm.map|cm-super-t1.map|cm-super-t2a.map|cm-super-t2b.map|cm-super-t2c.map|cm-super-ts1.map|cm-super-x2.map|cmtext-bsr-interpolated.map|cyrillic.map|dvng.map|esint.map|ethiop.map|eurosym.map|hfbright.map|iby.map|latxfont.map|lxfonts.map|manfnt.map|mflogo.map|mongolian.map|musix.map|pigpen.map|plother.map|pltext.map|rsfs.map|semaf.map|stmaryrd.map|symbols.map|tipa.map|trajan.map|vnrother.map|vnrtext.map|wasy.map|xypic.map|yhmath.map'` + if `echo $shortfile | grep -Eq 'allrunes.map|arabtex.map|arss.map|artm.map|bbold.map|cbgreek-full.map|ccpl.map|cmextra.map|cmll.map|cm.map|cm-super-t1.map|cm-super-t2a.map|cm-super-t2b.map|cm-super-t2c.map|cm-super-ts1.map|cm-super-x2.map|cmtext-bsr-interpolated.map|cyrillic.map|dvng.map|esint.map|ethiop.map|eurosym.map|hfbright.map|iby.map|latxfont.map|lxfonts.map|manfnt.map|mflogo.map|mongolian.map|musix.map|pigpen.map|plother.map|pltext.map|rsfs.map|semaf.map|stmaryrd.map|symbols.map|tipa.map|trajan.map|vnrother.map|vnrtext.map|wasy.map|xypic.map|yhmath.map'`; then %{_bindir}/updmap-sys --nomkmap --disable MultiMap=$shortfile > /dev/null 2>&1 else %{_bindir}/updmap-sys --nomkmap --disable Map=$shortfile > /dev/null 2>&1 @@ -179349,8 +179349,11 @@ Release: %{tl_noarch_release} BuildArch: noarch Requires: texlive-base Requires: texlive-kpathsea-bin, tex-kpathsea - Requires: texlive-uplatex-bin +Provides: tex-uptex = %{tl_version} +Obsoletes: tex-uptex <= 2015 +Provides: texlive-uptex = %{tl_version} +Obsoletes: texlive-uptex <= svn36796.1.20 Provides: tex(utbook.cls) = %{tl_version} Provides: tex(utreport.cls) = %{tl_version} Provides: tex(ujreport.cls) = %{tl_version} @@ -221784,6 +221787,11 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Mon Oct 10 2016 Tom Callaway 5:2016-8.2016520 +- fix syntax error in trigger +- move triggers to the kpathsea subpackage (top of the dependency chain) +- properly obsolete texlive-uptex + * Thu Oct 6 2016 Tom Callaway 5:2016-7.20160520 - clean up invalid Obsoletes