From 688a6f2d93fbed4c0b840c5a2bfd7bd21a673b0d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 13 May 2015 20:38:52 -0600 Subject: [PATCH] New upstream version. Unbundle the Lato fonts. --- .gitignore | 1 + python-sphinx_rtd_theme.spec | 40 +++++++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c67b8ce..40a7857 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sphinx_rtd_theme-0.1.7.tar.gz +/sphinx_rtd_theme-0.1.8.tar.gz diff --git a/python-sphinx_rtd_theme.spec b/python-sphinx_rtd_theme.spec index 477efc9..5c3dda1 100644 --- a/python-sphinx_rtd_theme.spec +++ b/python-sphinx_rtd_theme.spec @@ -5,7 +5,7 @@ %global pkgname sphinx_rtd_theme Name: python-%{pkgname} -Version: 0.1.7 +Version: 0.1.8 Release: 1%{?dist} Summary: Sphinx theme for readthedocs.org @@ -22,7 +22,8 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %endif -Requires: fontawesome-fonts +Requires: font(fontawesome) +Requires: font(lato) %description This is a prototype mobile-friendly sphinx theme for readthedocs.org. @@ -33,7 +34,8 @@ of that site. %if 0%{?with_py3} %package -n python3-%{pkgname} Summary: Sphinx theme for readthedocs.org -Requires: fontawesome-fonts +Requires: font(fontawesome) +Requires: font(lato) %description -n python3-%{pkgname} This is a prototype mobile-friendly sphinx theme for readthedocs.org. @@ -67,10 +69,20 @@ pushd %{pkgname}-%{version} %{__python2} setup.py install -O1 --skip-build --root %{buildroot} popd -# Don't use the bundled font -rm %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/*.ttf +# Don't use the bundled fonts +rm %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/*.{svg,woff} +rm %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/fontawesome*.ttf +rm %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/Lato*.ttf +ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.svg \ + %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/ ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.ttf \ %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/ +ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.woff \ + %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/ +ln -s %{_datadir}/fonts/lato/Lato-Bold.ttf \ + %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/ +ln -s %{_datadir}/fonts/lato/Lato-Regular.ttf \ + %{buildroot}/%{python2_sitelib}/%{pkgname}/static/fonts/ %if 0%{?with_py3} # Python 3 install @@ -78,10 +90,20 @@ pushd python3-%{pkgname}-%{version} %{__python3} setup.py install -O1 --skip-build --root %{buildroot} popd -# Don't use the bundled font -rm %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/*.ttf +# Don't use the bundled fonte +rm %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/*.{svg,woff} +rm %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/fontawesome*.ttf +rm %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/Lato*.ttf +ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.svg \ + %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/ ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.ttf \ %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/ +ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.woff \ + %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/ +ln -s %{_datadir}/fonts/lato/Lato-Bold.ttf \ + %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/ +ln -s %{_datadir}/fonts/lato/Lato-Regular.ttf \ + %{buildroot}/%{python3_sitelib}/%{pkgname}/static/fonts/ %endif %files @@ -97,6 +119,10 @@ ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.ttf \ %endif %changelog +* Wed May 13 2015 Jerry James - 0.1.8-1 +- New upstream version +- Unbundle the Lato fonts + * Wed Mar 11 2015 Jerry James - 0.1.7-1 - New upstream version diff --git a/sources b/sources index 123912c..9cf1243 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ffe014445195705968d899c38b305fd sphinx_rtd_theme-0.1.7.tar.gz +713ce7c53239449bdd799385577329ee sphinx_rtd_theme-0.1.8.tar.gz