From cdc6ec80d2dcc170a7e66f08e5b03275610baead Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 21 Jul 2020 20:24:17 -0600 Subject: [PATCH] Find fonts in a more robust fashion. --- python-networkx.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/python-networkx.spec b/python-networkx.spec index ec54740..837b7df 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -21,6 +21,11 @@ Patch3: %{name}-arg-order.patch BuildArch: noarch +BuildRequires: fontawesome-fonts-web +BuildRequires: font(fontawesome) +BuildRequires: font(lato) +BuildRequires: font(robotoslab) +BuildRequires: fontconfig BuildRequires: python3-devel BuildRequires: python3-docs BuildRequires: python3-numpy-doc @@ -69,8 +74,6 @@ Recommends: python3dist(pyyaml) Recommends: python3dist(scipy) Recommends: xdg-utils -%{?python_provide:%python_provide python3-%{srcname}} - # This can be removed when Fedora 30 reaches EOL Obsoletes: python3-%{srcname}-test < 2.3-2 Provides: python3-%{srcname}-test = %{version}-%{release} @@ -122,12 +125,12 @@ for suffix in eot svg ttf woff woff2; do ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.$suffix . done rm {Lato,RobotoSlab}/*.ttf -ln -s %{_datadir}/fonts/lato/Lato-Bold.ttf Lato/lato-bold.ttf -ln -s %{_datadir}/fonts/lato/Lato-BoldItalic.ttf Lato/lato-bolditalic.ttf -ln -s %{_datadir}/fonts/lato/Lato-Italic.ttf Lato/lato-italic.ttf -ln -s %{_datadir}/fonts/lato/Lato-Regular.ttf Lato/lato-regular.ttf -ln -s %{_datadir}/fonts/google-roboto-slab/RobotoSlab-Bold.ttf RobotoSlab/roboto-slab-v7-bold.ttf -ln -s %{_datadir}/fonts/google-roboto-slab/RobotoSlab-Regular.ttf RobotoSlab/roboto-slab-v7-regular.ttf +ln -s $(fc-match -f "%%{file}" "lato:bold") Lato/lato-bold.ttf +ln -s $(fc-match -f "%%{file}" "lato:bold:italic") Lato/lato-bolditalic.ttf +ln -s $(fc-match -f "%%{file}" "lato:italic") Lato/lato-italic.ttf +ln -s $(fc-match -f "%%{file}" "lato") Lato/lato-regular.ttf +ln -s $(fc-match -f "%%{file}" "robotoslab:bold") RobotoSlab/roboto-slab-v7-bold.ttf +ln -s $(fc-match -f "%%{file}" "robotoslab") RobotoSlab/roboto-slab-v7-regular.ttf cd - %install