Update to 3.2.1

- Remove compatibility symbolic links from /usr/libexec/
- Use %pytest
This commit is contained in:
Miro Hrončok 2020-08-18 13:05:00 +02:00
commit 5bf9c06479
3 changed files with 10 additions and 10 deletions

View file

@ -21,7 +21,7 @@
%global upstream_name Sphinx
Name: python-sphinx
%global general_version 3.1.2
%global general_version 3.2.1
#global prerel ...
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
@ -294,12 +294,10 @@ popd
%install
%py3_install
# For backwards compatibility. Remove around Fedora 33 (with care)
install -d %{buildroot}%{_libexecdir}/python%{python3_pkgversion}-sphinx
# For backwards compatibility. Remove with care, if at all
for i in sphinx-{apidoc,autogen,build,quickstart}; do
ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3
ln -s %{_bindir}/$i %{buildroot}%{_libexecdir}/python%{python3_pkgversion}-sphinx/$i
done
# Clean up non-python files
@ -353,11 +351,8 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
%if %{with tests}
%check
export PYTHONPATH=%{buildroot}%{python3_sitelib}
export PATH=%{buildroot}%{_bindir}:$PATH
# Currently, all linkcheck tests and test_latex_images need internet
%{__python3} -m pytest \
%pytest \
%if %{without internet}
-k "not linkcheck and not test_latex_images" \
%endif
@ -372,7 +367,6 @@ export PATH=%{buildroot}%{_bindir}:$PATH
%{python3_sitelib}/sphinx/
%dir %{python3_sitelib}/sphinxcontrib/
%{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/
%{_libexecdir}/python%{python3_pkgversion}-sphinx/
%dir %{_datadir}/sphinx/
%dir %{_datadir}/sphinx/locale
%dir %{_datadir}/sphinx/locale/*
@ -389,6 +383,11 @@ export PATH=%{buildroot}%{_bindir}:$PATH
%changelog
* Tue Aug 18 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.2.1-1
- Update to 3.2.1
- Remove compatibility symbolic links from /usr/libexec/
- Fixes rhbz#1867294
* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.1.2-1
- Update to 3.1.2
- Fixes rhbz#1853901