Update to 3.2.1

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

.gitignore

@@ -22,3 +22,6 @@
 /Sphinx-2.1.2.tar.gz
 /Sphinx-2.2.0.tar.gz
 /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

@@ -15,15 +15,17 @@
 %bcond_without imagemagick_tests
 %endif
 
+# During texlive updates, sometimes the latex environment is unstable
+%bcond_without latex_tests
 
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-%global     general_version 2.2.2
+%global     general_version 3.2.1
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    2%{?dist}
+Release:    1%{?dist}
 Epoch:      1
 Summary:    Python documentation generator
 
@@ -42,26 +44,26 @@ Patch1:     sphinx-test_theming.diff
 
 BuildArch:     noarch
 
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
+BuildRequires: python%{python3_pkgversion}-devel
+BuildRequires: python%{python3_pkgversion}-setuptools
 
-BuildRequires: python3-babel
-BuildRequires: python3-docutils
-BuildRequires: python3-imagesize
-BuildRequires: python3-jinja2
-BuildRequires: python3-packaging
-BuildRequires: python3-pygments
-BuildRequires: python3-requests
-BuildRequires: python3-sphinxcontrib-applehelp
-BuildRequires: python3-sphinxcontrib-devhelp
-BuildRequires: python3-sphinxcontrib-htmlhelp
-BuildRequires: python3-sphinxcontrib-jsmath
-BuildRequires: python3-sphinxcontrib-qthelp
-BuildRequires: python3-sphinxcontrib-serializinghtml
-BuildRequires: python3-sphinx-theme-alabaster
+BuildRequires: python%{python3_pkgversion}-babel
+BuildRequires: python%{python3_pkgversion}-docutils
+BuildRequires: python%{python3_pkgversion}-imagesize
+BuildRequires: python%{python3_pkgversion}-jinja2
+BuildRequires: python%{python3_pkgversion}-packaging
+BuildRequires: python%{python3_pkgversion}-pygments
+BuildRequires: python%{python3_pkgversion}-requests
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-applehelp
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-jsmath
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml
+BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster
 
 %if %{with websupport}
-BuildRequires: python3-sphinxcontrib-websupport
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
 %endif
 
 # for fixes
@@ -69,12 +71,12 @@ BuildRequires: dos2unix
 
 %if %{with tests}
 # tests import _testcapi
-BuildRequires: python3-test
+BuildRequires: python%{python3_pkgversion}-test
 
-BuildRequires: python3-html5lib
-BuildRequires: python3-mock
-BuildRequires: python3-pytest
-BuildRequires: python3-snowballstemmer
+BuildRequires: python%{python3_pkgversion}-html5lib
+BuildRequires: python%{python3_pkgversion}-mock
+BuildRequires: python%{python3_pkgversion}-pytest
+BuildRequires: python%{python3_pkgversion}-snowballstemmer
 
 BuildRequires: gettext
 BuildRequires: graphviz
@@ -84,6 +86,7 @@ BuildRequires: texinfo
 BuildRequires: ImageMagick
 %endif
 
+%if %{with latex_tests}
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latex
 BuildRequires: texlive-dvipng
@@ -114,6 +117,7 @@ BuildRequires: tex(upquote.sty)
 BuildRequires: tex(utf8x.def)
 BuildRequires: tex(wrapfig.sty)
 %endif
+%endif
 
 
 %description
@@ -145,12 +149,12 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%package -n python3-sphinx
+%package -n python%{python3_pkgversion}-sphinx
 Summary:       Python documentation generator
 
 Recommends:    graphviz
 Recommends:    ImageMagick
-%{?python_provide:%python_provide python3-sphinx}
+%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx}
 
 # Bundled JavaScript
 Provides:      bundled(jquery) = 3.2.1
@@ -160,13 +164,13 @@ Provides:      bundled(css3-mediaqueries) = 1.0
 # Remove in F33
 Obsoletes:     python-sphinx-locale < 1:2
 Provides:      python-sphinx-locale = %{epoch}:%{version}-%{release}
-Obsoletes:     python3-sphinxcontrib-napoleon < 0.3.0
-Provides:      python3-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release}
+Obsoletes:     python%{python3_pkgversion}-sphinxcontrib-napoleon < 0.3.0
+Provides:      python%{python3_pkgversion}-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release}
 Conflicts:     python2-Sphinx < 1:2
 Conflicts:     python2-sphinx < 1:2
 Provides:      python(Sphinx) = %{epoch}:%{version}-%{release}
 
-%description -n python3-sphinx
+%description -n python%{python3_pkgversion}-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
 consisting of multiple reStructuredText sources), written by Georg
@@ -195,10 +199,10 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%package -n python3-sphinx-latex
-Summary:       LaTeX builder dependencies for python3-sphinx
+%package -n python%{python3_pkgversion}-sphinx-latex
+Summary:       LaTeX builder dependencies for python%{python3_pkgversion}-sphinx
 
-Requires:      python3-sphinx = %{epoch}:%{version}-%{release}
+Requires:      python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
 Requires:      texlive-dvipng
@@ -229,13 +233,13 @@ Requires:      tex(upquote.sty)
 Requires:      tex(utf8x.def)
 Requires:      tex(wrapfig.sty)
 
-%{?python_provide:%python_provide python3-sphinx-latex}
+%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx-latex}
 
 # Remove in F33
 Obsoletes:     python-sphinx-latex < 1:2
 Provides:      python-sphinx-latex = %{epoch}:%{version}-%{release}
 
-%description  -n python3-sphinx-latex
+%description  -n python%{python3_pkgversion}-sphinx-latex
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
 consisting of multiple reStructuredText sources), written by Georg
@@ -250,7 +254,7 @@ builder.
 %package doc
 Summary:       Documentation for %{name}
 License:       BSD
-Recommends:    python3-sphinx = %{epoch}:%{version}-%{release}
+Recommends:    python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
 
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -290,12 +294,10 @@ popd
 %install
 %py3_install
 
-# For backwards compatibility. Remove around Fedora 33 (with care)
-install -d %{buildroot}%{_libexecdir}/python3-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}/python3-sphinx/$i
 done
 
 # Clean up non-python files
@@ -349,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
@@ -361,21 +360,20 @@ export PATH=%{buildroot}%{_bindir}:$PATH
 %endif
 
 
-%files -n python3-sphinx -f sphinx.lang
+%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang
 %license LICENSE
 %doc AUTHORS CHANGES EXAMPLES README.rst
 %{_bindir}/sphinx-*
 %{python3_sitelib}/sphinx/
 %dir %{python3_sitelib}/sphinxcontrib/
 %{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/
-%{_libexecdir}/python3-sphinx/
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
 %{_mandir}/man1/sphinx-*
 
 
-%files -n python3-sphinx-latex
+%files -n python%{python3_pkgversion}-sphinx-latex
 # empty, this is a metapackage
 
 
@@ -385,6 +383,27 @@ 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
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 30 2020 Charalampos Stratakis <cstratak@redhat.com> - 1:3.1.1-1
+- Update to 3.1.1 (#1783776)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-4
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-3
+- Bootstrap for Python 3.9
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (Sphinx-2.2.2.tar.gz) = 2aaed5980c6fb3bf1a8b2911bbf5d7b8a2d9356e2e9faad58e9ac93e76f76e0c5f40243774553a719dfe982e5e683821545db56142cd8e3db914e97e363124f1
+SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb