Update to 4.4.0

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -25,3 +25,14 @@
 /Sphinx-3.1.1.tar.gz
 /Sphinx-3.1.2.tar.gz
 /Sphinx-3.2.1.tar.gz
+/Sphinx-3.3.1.tar.gz
+/Sphinx-3.4.3.tar.gz
+/Sphinx-3.5.2.tar.gz
+/Sphinx-3.5.3.tar.gz
+/Sphinx-3.5.4.tar.gz
+/Sphinx-4.0.2.tar.gz
+/Sphinx-4.1.2.tar.gz
+/Sphinx-4.2.0.tar.gz
+/Sphinx-4.3.0.tar.gz
+/Sphinx-4.3.1.tar.gz
+/Sphinx-4.4.0.tar.gz

python-sphinx.spec

@@ -4,6 +4,9 @@
 # Also, we don't have all the tests requirements
 %bcond_without tests
 
+# Unset -s on python shebang to allow RPM-installed sphinx to be used
+# with user-installed modules (#1903763)
+%global py3_shebang_flags %nil
 
 # No internet in Koji
 %bcond_with internet
@@ -21,7 +24,7 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-%global     general_version 3.2.1
+%global     general_version 4.4.0
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
@@ -44,23 +47,9 @@ Patch1:     sphinx-test_theming.diff
 
 BuildArch:     noarch
 
+BuildRequires: make
 BuildRequires: python%{python3_pkgversion}-devel
-BuildRequires: python%{python3_pkgversion}-setuptools
-
-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
+BuildRequires: pyproject-rpm-macros
 
 %if %{with websupport}
 BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
@@ -73,11 +62,7 @@ BuildRequires: dos2unix
 # tests import _testcapi
 BuildRequires: python%{python3_pkgversion}-test
 
-BuildRequires: python%{python3_pkgversion}-html5lib
-BuildRequires: python%{python3_pkgversion}-mock
-BuildRequires: python%{python3_pkgversion}-pytest
-BuildRequires: python%{python3_pkgversion}-snowballstemmer
-
+BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: graphviz
 BuildRequires: texinfo
@@ -154,22 +139,12 @@ Summary:       Python documentation generator
 
 Recommends:    graphviz
 Recommends:    ImageMagick
-%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx}
 
 # Bundled JavaScript
-Provides:      bundled(jquery) = 3.2.1
+Provides:      bundled(jquery) = 3.5.1
 Provides:      bundled(underscore) = 1.3.1
 Provides:      bundled(css3-mediaqueries) = 1.0
 
-# Remove in F33
-Obsoletes:     python-sphinx-locale < 1:2
-Provides:      python-sphinx-locale = %{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 python%{python3_pkgversion}-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
@@ -233,11 +208,8 @@ Requires:      tex(upquote.sty)
 Requires:      tex(utf8x.def)
 Requires:      tex(wrapfig.sty)
 
-%{?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}
+# No files in this package, automatic provides don't work:
+%py_provides   python%{python3_pkgversion}-sphinx-latex
 
 %description  -n python%{python3_pkgversion}-sphinx-latex
 Sphinx is a tool that makes it easy to create intelligent and
@@ -277,13 +249,22 @@ dos2unix -k ./sphinx/themes/basic/static/jquery.js
 rm tests/test_ext_imgconverter.py
 %endif
 
+# Don't measure coverage:
+sed -i '/pytest-cov/d' setup.py
+# Not needed on recent Pythons, https://github.com/sphinx-doc/sphinx/pull/8483
+sed -i '/typed_ast/d' setup.py
+
+
+%generate_buildrequires
+%pyproject_buildrequires -r %{?with_tests:-x test}
+
 
 %build
-%py3_build
+%pyproject_wheel
 
 export PYTHONPATH=$PWD
 pushd doc
-export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py"
+export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py"
 make html SPHINXBUILD="$SPHINXBUILD"
 make man SPHINXBUILD="$SPHINXBUILD"
 rm -rf _build/html/.buildinfo
@@ -292,7 +273,7 @@ popd
 
 
 %install
-%py3_install
+%pyproject_install
 
 # For backwards compatibility. Remove with care, if at all
 for i in sphinx-{apidoc,autogen,build,quickstart}; do
@@ -366,7 +347,7 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 %{_bindir}/sphinx-*
 %{python3_sitelib}/sphinx/
 %dir %{python3_sitelib}/sphinxcontrib/
-%{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/
+%{python3_sitelib}/Sphinx-%{upstream_version}.dist-info/
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
@@ -383,6 +364,81 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %changelog
+* Tue Feb 01 2022 Karolina Surma <ksurma@redhat.com> - 1:4.4.0-1
+- Update to 4.4.0
+- Fixes rhbz#2033955
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Nov 29 2021 Karolina Surma <ksurma@redhat.com> - 1:4.3.1-1
+- Update to 4.3.1
+- Fixes rhbz#2027059
+
+* Fri Nov 19 2021 Karolina Surma <ksurma@redhat.com> - 1:4.3.0-1
+- Update to 4.3.0
+- Fixes rhbz#2022111
+
+* Fri Sep 17 2021 Karolina Surma <ksurma@redhat.com> - 1:4.2.0-1
+- Update to 4.2.0
+- Fixes rhbz#2003427
+
+* Thu Sep 16 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-3
+- Display typing objects correctly with Python 3.10 (fix FTBFS)
+- Generate correct reference to parent class if class has `_name` attribute
+- Enable previously deselected test
+
+* Wed Aug 18 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-2
+- Patch python-sphinx to work with python-pygments >=2.10
+
+* Mon Aug 02 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-1
+- Update to 4.1.2
+- Fixes rhbz#1979326
+- Backport commit to fix python-sphinx with Python 3.10-rc1
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 11 2021 Karolina Surma <ksurma@redhat.com> - 1:4.0.2-1
+- Update to 4.0.2
+- Fixes rhbz#1948279
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1:3.5.4-3
+- Rebuilt for Python 3.10
+
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1:3.5.4-2
+- Bootstrap for Python 3.10
+
+* Mon May 10 2021 Karolina Surma <ksurma@redhat.com> - 1:3.5.4-1
+- Update to 3.5.4
+- Fixes rhbz#1949477
+
+* Thu Apr 01 2021 Karolina Surma <ksurma@redhat.com> - 1:3.5.3-1
+- Update to 3.5.3
+- Fixes rhbz#1941161
+
+* Wed Mar 10 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.5.2-1
+- Update 3.5.2
+- Fixes rhbz#1928459
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 19 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.4.3-1
+- Update to 3.4.3
+- Fixes rhbz#1909494
+
+* Sat Dec 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 1:3.3.1-2
+- Unset -s from python shebang
+- Fixes: rhbz#1903763
+
+* Mon Nov 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.3.1-1
+- Update to 3.3.1
+- Fixes: rhbz#1893752
+
+* Wed Oct 14 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:3.2.1-2
+- Backport commit to fix python-sphinx with python-pygments v2.7.1
+
 * 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/

rpminspect.yaml

@@ -0,0 +1,4 @@
+# exclude XML template (not always valid) from XML validity check:
+xml:
+    ignore:
+        - /usr/lib/python*/site-packages/sphinx/themes/basic/opensearch.xml

sources

@@ -1 +1 @@
-SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
+SHA512 (Sphinx-4.4.0.tar.gz) = f5780a7da7a5d758b0e145ab9a7f191a9c65fd3ca4624ca3a04f0d161e3cd6c7133df53ff56e42f012687cbce0460178c2e7957974b5b929b341c98db996c640

sphinx-test_theming.diff

@@ -5,8 +5,8 @@ diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_them
          themes.append('alabaster')
  
      # test Theme class API
--    assert set(app.html_themes.keys()) == set(themes)
-+    assert set(app.html_themes.keys()) >= set(themes)
-     assert app.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
-     assert app.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
-     assert app.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'
+-    assert set(app.registry.html_themes.keys()) == set(themes)
++    assert set(app.registry.html_themes.keys()) >= set(themes)
+     assert app.registry.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
+     assert app.registry.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
+     assert app.registry.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'