From 38a6e14437987858cd374b6fb33a96130a228890 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 19 Jan 2016 22:30:48 -0500 Subject: [PATCH] fix the last few bits of font handling --- texlive.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/texlive.spec b/texlive.spec index ad42938..2664cee 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,6 +1,6 @@ %global source_date 20150728_r37987 %global tl_version 2015 -%global tl_rel 20 +%global tl_rel 21 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -107245,6 +107245,8 @@ Release: %{tl_noarch_release} BuildArch: noarch Requires: texlive-base Requires: texlive-kpathsea-bin, tex-kpathsea +# A bit of a lie, but we want people who install texlive-oldstandard to end up with the system fonts. +Requires: oldstandard-sfd-fonts Requires(post,postun): coreutils Provides: tex(OldStandard-Bold.otf) = %{tl_version} Provides: tex(OldStandard-Italic.otf) = %{tl_version} @@ -118108,6 +118110,8 @@ Requires: texlive-tetex-bin, tex-tetex Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra Requires(post,postun): coreutils Requires: tex(textcomp.sty) +# A bit of a lie, but we want people who install texlive-stix to get the system fonts too +Requires: stix-fonts stix-math-fonts Provides: tex(stix-extra1.enc) = %{tl_version} Provides: tex(stix-extra2.enc) = %{tl_version} Provides: tex(stix-extra3.enc) = %{tl_version} @@ -286618,8 +286622,9 @@ patch -p0 < %{_sourcedir}/texlive-latexdiff-perl518.patch popd # make opentype fontdir symlinks -# NOTE: fontawesome is a conflict, so we just Requires: fontawesome-fonts for it -# NOTE: We might have to handle this differently if there are lots of conflicts. +# NOTE: fontawesome, stix, oldstandard are a conflict, so we just add Requires for the +# corresponding system font packages for them. +# NOTE: We might have to handle this differently if there are lots of conflicts later. mkdir -p %{buildroot}%{_datadir}/fonts pushd %{buildroot}%{_datadir}/fonts for i in adobe/sourcecodepro adobe/sourcesanspro adobe/sourceserifpro \ @@ -286636,8 +286641,8 @@ for i in adobe/sourcecodepro adobe/sourcesanspro adobe/sourceserifpro \ public/gfsneohellenic public/gfsporson public/gfssolomos public/gnu-freefont \ public/heuristica public/inconsolata public/libertine public/lilyglyphs \ public/lm public/lm-math public/mdsymbol public/mnsymbol public/newpx \ - public/ocr-b-outline public/oldstandard public/phaistos public/philokalia \ - public/playfair public/punknova public/semaphor public/skaknew public/stix \ + public/ocr-b-outline public/phaistos public/philokalia \ + public/playfair public/punknova public/semaphor public/skaknew \ public/tex-gyre public/tex-gyre-math public/umtypewriter public/xcharter \ public/xits rozynski/comicneue ; do j=`echo $i | cut -d / -f 2` @@ -361240,7 +361245,6 @@ fi %files oldstandard %defattr(-,root,root) -%{_datadir}/fonts/oldstandard %{_texdir}/texmf-dist/fonts/opentype/public/oldstandard/OldStandard-Bold.otf %{_texdir}/texmf-dist/fonts/opentype/public/oldstandard/OldStandard-Italic.otf %{_texdir}/texmf-dist/fonts/opentype/public/oldstandard/OldStandard-Regular.otf @@ -370602,7 +370606,6 @@ fi %files stix %defattr(-,root,root) -%{_datadir}/fonts/stix %{_texdir}/texmf-dist/fonts/enc/dvips/stix/stix-extra1.enc %{_texdir}/texmf-dist/fonts/enc/dvips/stix/stix-extra2.enc %{_texdir}/texmf-dist/fonts/enc/dvips/stix/stix-extra3.enc @@ -443494,6 +443497,11 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jan 19 2016 Tom Callaway - 5:2015-21.20150728_r37987 +- fix texlive-stix opentype font handling (bz1299790) +- fix texlive-oldstandard opentype font handling (no bug, just checked the rest of them + to preempt it) + * Mon Jan 18 2016 Tom Callaway - 5:2015-20.20150728_r37987 - add Requires: tex(pzdr.tfm) to hyperref (bz1299422) - fix texlive-fontawesome opentype font handling (bz1299199)