do not make ebgaramond a system font, fix more missing deps

This commit is contained in:
Tom Callaway 2017-01-16 16:46:16 -05:00
parent cb41317313
commit 90c6e7c05b

View File

@ -1,6 +1,6 @@
%global source_date 20160520 %global source_date 20160520
%global tl_version 2016 %global tl_version 2016
%global tl_rel 30 %global tl_rel 31
%global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source %global source_name texlive-%{source_date}-source
@ -22409,7 +22409,7 @@ Release: %{tl_noarch_release}
BuildArch: noarch BuildArch: noarch
Requires: texlive-base Requires: texlive-base
Requires: texlive-kpathsea-bin, tex-kpathsea Requires: texlive-kpathsea-bin, tex-kpathsea
Requires: texlive-graphics-cfg
Requires: tex(colortbl.sty) Requires: tex(colortbl.sty)
Requires: tex(pdfcolmk.sty) Requires: tex(pdfcolmk.sty)
Provides: tex(svgnam.def) = %{tl_version} Provides: tex(svgnam.def) = %{tl_version}
@ -156356,6 +156356,7 @@ Summary: Binaries for luaotfload
Version: svn34647.0 Version: svn34647.0
Requires: texlive-base Requires: texlive-base
Requires: texlive-luaotfload Requires: texlive-luaotfload
Requires: texlive-lua-alt-getopt
Release: %{tl_release} Release: %{tl_release}
BuildArch: noarch BuildArch: noarch
@ -186074,6 +186075,12 @@ popd
# NOTE: fontawesome, stix, oldstandard are a conflict, so we just add Requires for the # NOTE: fontawesome, stix, oldstandard are a conflict, so we just add Requires for the
# corresponding system font packages for them. # corresponding system font packages for them.
# NOTE: We might have to handle this differently if there are lots of conflicts later. # NOTE: We might have to handle this differently if there are lots of conflicts later.
# DO NOT MAKE A SYMLINK FOR public/ebgaramond
# The EB Garamond upstream font decided to map some historical flags (i.e., flags
# obsolete for centuries) to the Unicode flag emoji code points.
# Since most other fonts do not include the relevant code points, Fontconfig decides to
# pick up the EB Garamond flags through the fallback font mechanism for almost all
# fonts on the system, including DejaVu Sans, Liberation Sans, etc.
mkdir -p %{buildroot}%{_datadir}/fonts mkdir -p %{buildroot}%{_datadir}/fonts
pushd %{buildroot}%{_datadir}/fonts pushd %{buildroot}%{_datadir}/fonts
for i in adobe/sourcecodepro adobe/sourcesanspro adobe/sourceserifpro \ for i in adobe/sourcecodepro adobe/sourcesanspro adobe/sourceserifpro \
@ -186083,7 +186090,7 @@ for i in adobe/sourcecodepro adobe/sourcesanspro adobe/sourceserifpro \
impallari/lobster2 impallari/quattrocento impallari/raleway \ impallari/lobster2 impallari/quattrocento impallari/raleway \
nowacki/iwona nowacki/kurier public/almfixed public/antt \ nowacki/iwona nowacki/kurier public/almfixed public/antt \
public/Asana-Math public/baskervaldx public/ccicons public/cm-unicode \ public/Asana-Math public/baskervaldx public/ccicons public/cm-unicode \
public/cyklop public/dantelogo public/drm public/ebgaramond \ public/cyklop public/dantelogo public/drm \
public/erewhon public/fandol public/fbb public/fdsymbol public/fetamont \ public/erewhon public/fandol public/fbb public/fdsymbol public/fetamont \
public/fira public/gfsartemisia public/gfsbaskerville \ public/fira public/gfsartemisia public/gfsbaskerville \
public/gfsbodoni public/gfscomplutum public/gfsdidot \ public/gfsbodoni public/gfscomplutum public/gfsdidot \
@ -202722,7 +202729,6 @@ fi
%files ebgaramond %files ebgaramond
%license ofl.txt %license ofl.txt
%{_datadir}/fonts/ebgaramond
%{_texdir}/texmf-dist/fonts/enc/dvips/ebgaramond/ %{_texdir}/texmf-dist/fonts/enc/dvips/ebgaramond/
%{_texdir}/texmf-dist/fonts/map/dvips/ebgaramond/ %{_texdir}/texmf-dist/fonts/map/dvips/ebgaramond/
%{_texdir}/texmf-dist/fonts/opentype/public/ebgaramond/ %{_texdir}/texmf-dist/fonts/opentype/public/ebgaramond/
@ -222022,6 +222028,11 @@ fi
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Mon Jan 16 2017 Tom Callaway <spot@fedoraproject.org> - 6:2016-31.20160520
- do not make system dir symlink for ebgaramond (bz1410983)
- add Requires: texlive-lua-alt-getopt for texlive-luaotfload-bin (bz1405465)
- add Requires: texlive-graphics-cfg for texlive-xcolor
* Tue Jan 3 2017 Tom Callaway <spot@fedoraproject.org> - 6:2016-30.20160520 * Tue Jan 3 2017 Tom Callaway <spot@fedoraproject.org> - 6:2016-30.20160520
- improve provides/obsoletes around upltatex (bz1397766) - improve provides/obsoletes around upltatex (bz1397766)