From a61c36af85d7819712756dd9c6b92e4ff5aaeebc Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Mar 06 2019 15:01:50 +0000 Subject: Subpackage python2-sphinx_rtd_theme has been removed --- diff --git a/python-sphinx_rtd_theme.spec b/python-sphinx_rtd_theme.spec index d9f007e..5b85e03 100644 --- a/python-sphinx_rtd_theme.spec +++ b/python-sphinx_rtd_theme.spec @@ -1,12 +1,8 @@ -%if 0%{?fedora} || 0%{?rhel} >= 8 -%global with_py3 1 -%endif - %global srcname sphinx_rtd_theme Name: python-%{srcname} Version: 0.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Sphinx theme for readthedocs.org License: MIT @@ -14,20 +10,11 @@ URL: https://github.com/rtfd/%{srcname} Source0: https://github.com/rtfd/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2dist(pytest) -BuildRequires: python2dist(setuptools) -BuildRequires: python2dist(sphinx) - -%if 0%{?with_py3} BuildRequires: python3-devel BuildRequires: python3dist(pytest) BuildRequires: python3dist(setuptools) BuildRequires: python3dist(sphinx) BuildRequires: python3dist(sphinxcontrib-httpdomain) -%else -BuildRequires: python2dist(sphinxcontrib-httpdomain) -%endif %description This is a prototype mobile-friendly sphinx theme for readthedocs.org. @@ -35,22 +22,6 @@ It's currently in development and includes some rtd variable checks that can be ignored if you're just trying to use it on your project outside of that site. -%package -n python2-%{srcname} -Summary: Sphinx theme for readthedocs.org -Requires: fontawesome-fonts-web -Requires: font(fontawesome) -Requires: font(lato) -Requires: font(robotoslab) - -%{?python_provide:%python_provide python2-%{srcname}} - -%description -n python2-%{srcname} -This is a prototype mobile-friendly sphinx theme for readthedocs.org. -It's currently in development and includes some rtd variable checks that -can be ignored if you're just trying to use it on your project outside -of that site. - -%if 0%{?with_py3} %package -n python3-%{srcname} Summary: Sphinx theme for readthedocs.org Requires: fontawesome-fonts-web @@ -65,66 +36,19 @@ This is a prototype mobile-friendly sphinx theme for readthedocs.org. It's currently in development and includes some rtd variable checks that can be ignored if you're just trying to use it on your project outside of that site. -%endif %prep -%setup -q -c - -# Prepare for python3 build -cp -a %{srcname}-%{version} python3-%{srcname}-%{version} +%setup -q -n %{srcname}-%{version} %build -# Python 2 build -pushd %{srcname}-%{version} -%py2_build -popd - -%if 0%{?with_py3} -# Python 3 build -pushd python3-%{srcname}-%{version} %py3_build # Build the documentation make -C docs html SPHINXBUILD=sphinx-build-3 -popd -%else -pushd %{srcname}-%{version} -make -C docs html SPHINXBUILD=sphinx-build-2 -popd -%endif -%install -# Python 2 install -pushd %{srcname}-%{version} -%py2_install -popd -# Link to the required fonts and copy the parts not shipped by Fedora -pushd %{buildroot}%{python2_sitelib}/%{srcname}/static/fonts -mkdir Lato RobotoSlab -rm -f fontawesome-webfont.* -ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.eot . -ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.svg . -ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.ttf . -ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.woff . -ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.woff2 . -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 %{_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 -popd -cp -p %{srcname}-%{version}/fonts/RobotoSlab/*.{eot,woff,woff2} \ - %{buildroot}%{python2_sitelib}/%{srcname}/static/fonts/RobotoSlab -cp -p %{srcname}-%{version}/fonts/Lato/*.{eot,woff,woff2} \ - %{buildroot}%{python2_sitelib}/%{srcname}/static/fonts/Lato - -%if 0%{?with_py3} -# Python 3 install -pushd python3-%{srcname}-%{version} +%install %py3_install -popd # Link to the required fonts and copy the parts not shipped by Fedora pushd %{buildroot}%{python3_sitelib}/%{srcname}/static/fonts @@ -142,50 +66,27 @@ 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 popd -cp -p python3-%{srcname}-%{version}/fonts/RobotoSlab/*.{eot,woff,woff2} \ +cp -p fonts/RobotoSlab/*.{eot,woff,woff2} \ %{buildroot}%{python3_sitelib}/%{srcname}/static/fonts/RobotoSlab -cp -p python3-%{srcname}-%{version}/fonts/Lato/*.{eot,woff,woff2} \ +cp -p fonts/Lato/*.{eot,woff,woff2} \ %{buildroot}%{python3_sitelib}/%{srcname}/static/fonts/Lato -rm -fr python3-%{srcname}-%{version}/docs/build/html/_static/fonts +rm -fr docs/build/html/_static/fonts cp -a %{buildroot}%{python3_sitelib}/%{srcname}/static/fonts \ - python3-%{srcname}-%{version}/docs/build/html/_static -%else -rm -fr %{srcname}-%{version}/docs/build/html/_static/fonts -cp -a %{buildroot}%{python2_sitelib}/%{srcname}/static/fonts \ - %{srcname}-%{version}/docs/build/html/_static -%endif + docs/build/html/_static %check -pushd %{srcname}-%{version} -%{__python2} setup.py test -popd - -%if 0%{?with_py3} -pushd python3-%{srcname}-%{version} %{__python3} setup.py test -popd -%endif - -%files -%if 0%{?with_py3} -%doc python3-%{srcname}-%{version}/docs/build/html/* -%else -%doc %{srcname}-%{version}/docs/build/html/* -%endif - -%files -n python2-%{srcname} -%doc %{srcname}-%{version}/README.rst -%license %{srcname}-%{version}/LICENSE -%{python2_sitelib}/%{srcname}* - -%if 0%{?with_py3} + %files -n python3-%{srcname} -%doc python3-%{srcname}-%{version}/README.rst -%license python3-%{srcname}-%{version}/LICENSE +%doc README.rst +%license LICENSE %{python3_sitelib}/%{srcname}* -%endif %changelog +* Wed Mar 06 2019 Miro Hrončok - 0.4.3-2 +- Subpackage python2-sphinx_rtd_theme has been removed + See https://fedoraproject.org/wiki/Changes/Sphinx2 + * Tue Feb 12 2019 Jerry James - 0.4.3-1 - New upstream version - Use the github tarball, which has docs, instead of the pypi tarball