Update to 3.2.1

- Remove compatibility symbolic links from /usr/libexec/
- Use %pytest

.gitignore

@@ -24,3 +24,4 @@
 /Sphinx-2.2.2.tar.gz
 /Sphinx-3.1.1.tar.gz
 /Sphinx-3.1.2.tar.gz
+/Sphinx-3.2.1.tar.gz

python-sphinx.spec

@@ -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

sources

@@ -1 +1 @@
-SHA512 (Sphinx-3.1.2.tar.gz) = d1b55a603ea4a76d2315e170b8ba7858caf1658660e9983034918bd265c505f0e5157ab9d9cebc970261646ae0959e1cf75562b01b73bf3a380e712393a735b9
+SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb