Update to 1.7.5 (bz#1570451)

Allow bootstrapping sphinx
1. Introduce --without websupport Sphinx (build)requires sphinxcontrib-websupport but that (build)requires sphinx. This bcond can be used to bootstrap this. 2. Introduce --without tests The tests bring a lot of additional dependencies that make bootstrapping harder. This allows to build without tests. 3. Build the docs with self The documentation was built with 'python', thus importing sphinx from python2's sitelib. Sphinx was installed because of the above mentioned buildrequirement of sphinxcontrib-websupport. Now current sphinx from PWD is used, also python3 is used when available, otherwise python2. Never just python.
2018-06-19 17:55:44 +02:00 · 2018-06-19 17:54:40 +02:00
13 changed files with 455 additions and 406 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,27 +14,3 @@
 /Sphinx-1.7.1.tar.gz
 /Sphinx-1.7.2.tar.gz
 /Sphinx-1.7.5.tar.gz
-/Sphinx-1.7.6.tar.gz
-/Sphinx-1.8.4.tar.gz
-/Sphinx-2.0.0b1.tar.gz
-/Sphinx-2.0.0b2.tar.gz
-/Sphinx-2.0.1.tar.gz
-/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
-/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
-/Sphinx-4.5.0.tar.gz
-/Sphinx-5.0.2.tar.gz
--- a/Fix-double-colons-with-docutils-0.18.patch
+++ b/Fix-double-colons-with-docutils-0.18.patch
@@ -1,27 +0,0 @@
-From 4b482334a28d0706ba4bd68d51be9c041c135798 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-Fran=C3=A7ois=20B?=
- <2589111+jfbu@users.noreply.github.com>
-Date: Sat, 25 Jun 2022 21:10:34 +0200
-Subject: [PATCH] Fix duplicated field term colons for Docutils 0.18+ (#10595)
-
-Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
---
- sphinx/themes/basic/static/basic.css_t | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/sphinx/themes/basic/static/basic.css_t b/sphinx/themes/basic/static/basic.css_t
-index d8f3fe74626..47f802dc4e7 100644
--- a/sphinx/themes/basic/static/basic.css_t
-+++ b/sphinx/themes/basic/static/basic.css_t
-@@ -686,9 +686,11 @@ dl.field-list > dt {
-     padding-right: 5px;
- }
- 
-+{%- if docutils_version_info[:2] < (0, 18) %}
- dl.field-list > dt:after {
-     content: ":";
- }
-+{% endif %}
- 
- dl.field-list > dd {
-     padding-left: 0.5em;
--- a/README.fedora
+++ b/README.fedora
@@ -0,0 +1,27 @@
+Sphinx with autodoc is sensitive to whether it is run via Python2 or Python3
+as it uses the Python version that it is invoked with to parse the source
+files for docstrings.  Unfortunately, there's no logic to detect this within
+the sphinx commands and the standard Makefiles generated by sphinx-quickstart
+don't give the user any hint that it might be a problem.
+
+The Fedora package tries to mitigate this problem by allowing the user to
+switch between the Python2 and Python3 versions using environment-modules.  To
+switch to the Python3 commands, use::
+
+    module swap python-sphinx/python3-sphinx
+
+To switch to the Python2 version, use::
+
+    module swap python-sphinx/python2-sphinx
+
+The default install uses the python2 version of the modules.
+If the system administrator wishes to change the default, edit the
+/etc/profile.d/zz-modules-python-sphinx.sh and
+/etc/profile.d/zz-modules-python-sphinx.csh files to specify a specific
+alternative to use.  For instance, to make the python3 version the default,
+modify it like so::
+
+    @@ -1,2 +1,2 @@
+     # Add path to the default python-sphinx scripts on this version of Fedora
+    -module load python-sphinx
+    +module load python-sphinx/python3-sphinx
--- a/default-sphinx-command.in
+++ b/default-sphinx-command.in
@@ -0,0 +1,2 @@
+#%Module1.0
+set ModuleVersion  "python@PYTHONVER@-sphinx"
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -1,15 +1,8 @@
-# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport
-# Without it we have warnings in docs, but it's not a hard dependency
-%bcond_without websupport
-# 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 %(echo %py3_shebang_flags | sed s/s//)
-
-# No internet in Koji
-%bcond_with internet
+%if 0%{?fedora} || 0%{?rhel} > 7
+%global with_python3 1
+%else
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
+%endif

 %if 0%{?rhel} > 7
 # Build without BuildRequires ImageMagick, to skip imgconverter tests
@@ -18,97 +11,154 @@
 %bcond_without imagemagick_tests
 %endif

-# During texlive updates, sometimes the latex environment is unstable
-%bcond_without latex_tests
+# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport
+%bcond_without websupport
+# Also, we don't have all the tests requirements
+%bcond_without tests
+
+# Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming
+%if 1
+%global py3_default 0
+%else
+%global py3_default 1
+%endif

 %global upstream_name Sphinx

 Name:       python-sphinx
-%global     general_version 5.0.2
-#global     prerel ...
-%global     upstream_version %{general_version}%{?prerel}
-Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    3%{?dist}
+Version:    1.7.5
+Release:    1%{?dist}
 Epoch:      1
 Summary:    Python documentation generator

+Group:      Development/Tools
+
 # Unless otherwise noted, the license for code is BSD
-# sphinx/util/inspect.py has bits licensed with PSF license v2 (Python)
-# sphinx/themes/haiku/static/haiku.css_t has bits licensed with MIT
-# JS: JQuery, Underscore, css3-mediaqueries are available under MIT
-License:    BSD and Python and MIT
+# sphinx/util/stemmer.py Public Domain
+# sphinx/pycode/pgen2 Python
+# jquery (MIT or GPLv2)
+License:    BSD and Public Domain and Python and (MIT or GPLv2)
+URL:        http://sphinx-doc.org/
+Source0:    https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+Source1:    python2-sphinx
+Source2:    python3-sphinx
+Source3:    zz-modules-python-sphinx.sh
+Source4:    zz-modules-python-sphinx.csh
+Source5:    README.fedora
+# environment-modules file to select whether the py2 or py3 version of
+# python-sphinx execuitables is default
+Source6:    default-sphinx-command.in

-URL:        https://www.sphinx-doc.org/
-Source0:    %{pypi_source %{upstream_name} %{upstream_version}}
-
-# Allow extra themes to exist. We pull in python3-sphinx-theme-alabaster
-# which causes that test to fail.
-Patch1:     sphinx-test_theming.diff
-
-# Fix double colon rendering in Sphinx roles
-# This was supposed to get to Sphinx 5.0.3 but it was never released
-# Backporting per request: https://bugzilla.redhat.com/show_bug.cgi?id=2166116
-# Upstream: https://github.com/sphinx-doc/sphinx/issues/10594
-Patch2:     Fix-double-colons-with-docutils-0.18.patch
+# Make the test_latex_remote_images an expected failure
+# since it requires an active internet connection
+# to fetch images, which is not possible in koji or mock.
+Patch0: xfail-test_latex_remote_images.patch

 BuildArch:     noarch
-
-BuildRequires: make
-BuildRequires: python%{python3_pkgversion}-devel
-BuildRequires: pyproject-rpm-macros
-
+BuildRequires: python2-devel >= 2.4
+BuildRequires: python2-babel
+BuildRequires: python2-setuptools
+BuildRequires: python2-docutils
+BuildRequires: python2-jinja2
+BuildRequires: python2-pygments >= 2.0
+BuildRequires: python2-six
+BuildRequires: python2-sphinx_rtd_theme
+BuildRequires: python2-sphinx-theme-alabaster
+BuildRequires: python2-imagesize
+BuildRequires: python2-requests
+BuildRequires: python2-packaging
+BuildRequires: python2-typing
 %if %{with websupport}
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
+BuildRequires: python2-sphinxcontrib-websupport
 %endif
+BuildRequires: environment(modules)

 # for fixes
 BuildRequires: dos2unix

 %if %{with tests}
-# tests import _testcapi
-BuildRequires: python%{python3_pkgversion}-test
-
-BuildRequires: gcc
+BuildRequires: python2-nose
+BuildRequires: python2-pytest
+BuildRequires: python2-pytest-cov
 BuildRequires: gettext
-BuildRequires: graphviz
 BuildRequires: texinfo
-
+BuildRequires: graphviz
+BuildRequires: python2-sqlalchemy
+BuildRequires: python2-mock
+BuildRequires: python2-simplejson
+BuildRequires: python2-html5lib
+BuildRequires: python2-whoosh
+BuildRequires: python2-snowballstemmer
+BuildRequires: python2-enum34
 %if %{with imagemagick_tests}
 BuildRequires: ImageMagick
 %endif
-
-%if %{with latex_tests}
+# note: no Python3 xapian binding yet
+BuildRequires: python2-xapian
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latex
 BuildRequires: texlive-dvipng
 BuildRequires: texlive-dvisvgm
+BuildRequires: texlive-ucs
+BuildRequires: tex(cmap.sty)
+BuildRequires: tex(ecrm1000.tfm)
+BuildRequires: tex(footnote.sty)
+BuildRequires: tex(framed.sty)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(parskip.sty)
+BuildRequires: tex(titlesec.sty)
+BuildRequires: tex(threeparttable.sty)
+BuildRequires: tex(upquote.sty)
+BuildRequires: tex(wrapfig.sty)
+BuildRequires: tex(capt-of.sty)
+BuildRequires: tex(needspace.sty)
+BuildRequires: tex(eqparbox.sty)
 BuildRequires: tex(amsmath.sty)
 BuildRequires: tex(amsthm.sty)
+BuildRequires: tex(amssymb.sty)
+BuildRequires: tex(amsfonts.sty)
+BuildRequires: tex(bm.sty)
+BuildRequires: tex(palatino.sty)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(eqparbox.sty)
+BuildRequires: tex(atbegshi.sty)
 BuildRequires: tex(anyfontsize.sty)
-BuildRequires: tex(article.cls)
-BuildRequires: tex(capt-of.sty)
-BuildRequires: tex(cmap.sty)
-BuildRequires: tex(color.sty)
-BuildRequires: tex(ctablestack.sty)
-BuildRequires: tex(fancyhdr.sty)
-BuildRequires: tex(fancyvrb.sty)
-BuildRequires: tex(fncychap.sty)
-BuildRequires: tex(framed.sty)
-BuildRequires: tex(FreeSerif.otf)
-BuildRequires: tex(geometry.sty)
-BuildRequires: tex(hyperref.sty)
-BuildRequires: tex(kvoptions.sty)
 BuildRequires: tex(luatex85.sty)
-BuildRequires: tex(needspace.sty)
-BuildRequires: tex(parskip.sty)
-BuildRequires: tex(polyglossia.sty)
+BuildRequires: tex(fncychap.sty)
 BuildRequires: tex(tabulary.sty)
-BuildRequires: tex(titlesec.sty)
-BuildRequires: tex(upquote.sty)
-BuildRequires: tex(utf8x.def)
-BuildRequires: tex(wrapfig.sty)
+BuildRequires: tex(polyglossia.sty)
+BuildRequires: tex(ctablestack.sty)
+BuildRequires: tex(eu1enc.def)
 %endif
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-babel
+BuildRequires: python3-setuptools
+BuildRequires: python3-docutils
+BuildRequires: python3-jinja2
+BuildRequires: python3-pygments
+BuildRequires: python3-six
+BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: python3-sphinx-theme-alabaster
+BuildRequires: python3-packaging
+BuildRequires: python3-imagesize
+BuildRequires: python3-requests
+%if %{with websupport}
+BuildRequires: python3-sphinxcontrib-websupport
 %endif
+%if %{with tests}
+BuildRequires: python3-nose
+BuildRequires: python3-pytest
+BuildRequires: python3-pytest-cov
+BuildRequires: python3-sqlalchemy
+BuildRequires: python3-mock
+BuildRequires: python3-simplejson
+BuildRequires: python3-html5lib
+BuildRequires: python3-whoosh
+BuildRequires: python3-snowballstemmer
+%endif
+%endif # with_python3


 %description
@@ -140,18 +190,41 @@ the Python docs:
      snippets and inclusion of appropriately formatted docstrings.


-%package -n python%{python3_pkgversion}-sphinx
+%package -n    python2-sphinx
 Summary:       Python documentation generator
-
+Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
+Requires:      python2-babel
+Requires:      python2-docutils
+Requires:      python2-jinja2
+Requires:      python2-pygments
+Requires:      python2-mock
+Requires:      python2-snowballstemmer
+Requires:      python2-sphinx_rtd_theme
+Requires:      python2-six
+Requires:      python2-sphinx-theme-alabaster
+Requires:      python2-imagesize
+Requires:      python2-requests
+Requires:      python2-packaging
+Requires:      python2-typing
+%if %{with websupport}
+Requires:      python2-sphinxcontrib-websupport
+%endif
+Requires: environment(modules)
+# Needed to get rid of the alternatives config installed in f24 and f25
+# versions of the package
+Requires(pre): /usr/sbin/alternatives
 Recommends:    graphviz
 Recommends:    ImageMagick
+Obsoletes:     python-sphinx <= 1.2.3
+Obsoletes:     python-sphinxcontrib-napoleon < 0.5
+Provides:      python-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
+Obsoletes:     python2-Sphinx <= 1.3.1-4
+Provides:      python2-Sphinx = %{?epoch}:%{version}-%{release}
+Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
+%{?python_provide:%python_provide python2-sphinx}
+Conflicts:     python3-sphinx < %{?epoch}:%{version}-%{release}

-# Bundled JavaScript
-Provides:      bundled(jquery) = 3.5.1
-Provides:      bundled(underscore) = 1.3.1
-Provides:      bundled(css3-mediaqueries) = 1.0
-
-%description -n python%{python3_pkgversion}-sphinx
+%description -n python2-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
@@ -180,44 +253,46 @@ the Python docs:
      snippets and inclusion of appropriately formatted docstrings.


-%package -n python%{python3_pkgversion}-sphinx-latex
-Summary:       LaTeX builder dependencies for python%{python3_pkgversion}-sphinx
-
-Requires:      python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
+%package latex
+Summary:       LaTeX builder dependencies for %{name}
+Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
 Requires:      texlive-dvipng
 Requires:      texlive-dvisvgm
+Requires:      texlive-ucs
+Requires:      tex(cmap.sty)
+Requires:      tex(ecrm1000.tfm)
+Requires:      tex(footnote.sty)
+Requires:      tex(framed.sty)
+Requires:      tex(multirow.sty)
+Requires:      tex(parskip.sty)
+Requires:      tex(titlesec.sty)
+Requires:      tex(threeparttable.sty)
+Requires:      tex(upquote.sty)
+Requires:      tex(wrapfig.sty)
+Requires:      tex(capt-of.sty)
+Requires:      tex(needspace.sty)
+Requires:      tex(eqparbox.sty)
 Requires:      tex(amsmath.sty)
 Requires:      tex(amsthm.sty)
+Requires:      tex(amssymb.sty)
+Requires:      tex(amsfonts.sty)
+Requires:      tex(bm.sty)
+Requires:      tex(palatino.sty)
+Requires:      tex(multirow.sty)
+Requires:      tex(eqparbox.sty)
+Requires:      tex(atbegshi.sty)
 Requires:      tex(anyfontsize.sty)
-Requires:      tex(article.cls)
-Requires:      tex(capt-of.sty)
-Requires:      tex(cmap.sty)
-Requires:      tex(color.sty)
-Requires:      tex(ctablestack.sty)
-Requires:      tex(fancyhdr.sty)
-Requires:      tex(fancyvrb.sty)
-Requires:      tex(fncychap.sty)
-Requires:      tex(framed.sty)
-Requires:      tex(FreeSerif.otf)
-Requires:      tex(geometry.sty)
-Requires:      tex(hyperref.sty)
-Requires:      tex(kvoptions.sty)
 Requires:      tex(luatex85.sty)
-Requires:      tex(needspace.sty)
-Requires:      tex(parskip.sty)
-Requires:      tex(polyglossia.sty)
+Requires:      tex(fncychap.sty)
 Requires:      tex(tabulary.sty)
-Requires:      tex(titlesec.sty)
-Requires:      tex(upquote.sty)
-Requires:      tex(utf8x.def)
-Requires:      tex(wrapfig.sty)
+Requires:      tex(polyglossia.sty)
+Requires:      tex(ctablestack.sty)
+Requires:      tex(eu1enc.def)
+Obsoletes:     python3-sphinx-latex < 1.4.4-2

-# No files in this package, automatic provides don't work:
-%py_provides   python%{python3_pkgversion}-sphinx-latex
-
-%description  -n python%{python3_pkgversion}-sphinx-latex
+%description 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
@@ -229,10 +304,73 @@ This package pulls in the TeX dependencies needed by Sphinx's LaTeX
 builder.


+%if 0%{?with_python3}
+%package -n python3-sphinx
+Summary:       Python documentation generator
+Group:         Development/Tools
+Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
+Requires:      python3-babel
+Requires:      python3-docutils
+Requires:      python3-jinja2
+Requires:      python3-pygments
+Requires:      python3-mock
+Requires:      python3-snowballstemmer
+Requires:      python3-sphinx_rtd_theme
+Requires:      python3-sphinx-theme-alabaster
+Requires:      python3-imagesize
+Requires:      python3-requests
+Requires:      python3-six
+Requires:      python3-packaging
+%if %{with websupport}
+Requires:      python3-sphinxcontrib-websupport
+%endif
+Recommends:    graphviz
+Recommends:    ImageMagick
+Requires: environment(modules)
+# Needed to get rid of the alternatives config installed in f24 and f25
+# versions of the package
+Requires(pre): /usr/sbin/alternatives
+Obsoletes:     python3-sphinxcontrib-napoleon < 0.3.0
+Provides:      python3-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
+Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
+%{?python_provide:%python_provide python3-sphinx}
+Conflicts:     python2-Sphinx < %{?epoch}:%{version}-%{release}
+
+%description -n python3-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
+Brandl. It was originally created to translate the new Python
+documentation, but has now been cleaned up in the hope that it will be
+useful to many other projects.
+
+Sphinx uses reStructuredText as its markup language, and many of its
+strengths come from the power and straightforwardness of
+reStructuredText and its parsing and translating suite, the Docutils.
+
+Although it is still under constant development, the following
+features are already present, work fine and can be seen "in action" in
+the Python docs:
+
+    * Output formats: HTML (including Windows HTML Help) and LaTeX,
+      for printable PDF versions
+    * Extensive cross-references: semantic markup and automatic links
+      for functions, classes, glossary terms and similar pieces of
+      information
+    * Hierarchical structure: easy definition of a document tree, with
+      automatic links to siblings, parents and children
+    * Automatic indices: general index as well as a module index
+    * Code handling: automatic highlighting using the Pygments highlighter
+    * Various extensions are available, e.g. for automatic testing of
+      snippets and inclusion of appropriately formatted docstrings.
+%endif # with_python3
+
+
 %package doc
 Summary:       Documentation for %{name}
+Group:         Documentation
 License:       BSD
-Recommends:    python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
+Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}

 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -245,8 +383,25 @@ useful to many other projects.
 This package contains documentation in reST and HTML formats.


+%package locale
+Summary:       Locale files for %{name}
+Group:         Development/Tools
+License:       BSD
+
+%description locale
+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
+Brandl. It was originally created to translate the new Python
+documentation, but has now been cleaned up in the hope that it will be
+useful to many other projects.
+
+This package contains locale files for Sphinx
+
 %prep
-%autosetup -n %{upstream_name}-%{upstream_version} -p1
+%autosetup -n %{upstream_name}-%{version}%{?prerel} -p1
+
+cp %{SOURCE5} .

 # fix line encoding of bundled jquery.js
 dos2unix -k ./sphinx/themes/basic/static/jquery.js
@@ -255,22 +410,29 @@ 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}
+%if %{without websupport}
+rm tests/test_websupport.py tests/test_api_translator.py
+%endif

+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif # with_python3

 %build
-%pyproject_wheel
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif # with_python3

 export PYTHONPATH=$PWD
 pushd doc
-export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py"
+%if 0%{?with_python3}
+export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py"
+%else
+export SPHINXBUILD="%{__python2} ../sphinx/cmd/build.py"
+%endif
+
 make html SPHINXBUILD="$SPHINXBUILD"
 make man SPHINXBUILD="$SPHINXBUILD"
 rm -rf _build/html/.buildinfo
@@ -279,40 +441,58 @@ popd


 %install
-%pyproject_install
-
-# For backwards compatibility. Remove with care, if at all
+%if 0%{?with_python3}
+%py3_install
+install -d %{buildroot}%{_libexecdir}/python3-sphinx
 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
+    mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
+    ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3
+    ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i
 done
+%endif # with_python3

-# Clean up non-python files
-rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
-rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
+%py2_install
+install -d %{buildroot}%{_libexecdir}/python2-sphinx
+for i in sphinx-{apidoc,autogen,build,quickstart}; do
+    mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version}
+    ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2
+    ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i
+done

 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
 for f in _build/man/sphinx-*.1;
 do
+    ### TODO: these are all the same.  Do we really need to ship them three
+    ### times or is it fine to just ship them as e.g. sphinx-build.1
    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f)
+    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python2_version}.1|")
+    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python3_version}.1|")
 done
+
+# Remove language files, they're identical to the ones from the
+# Python 2 build that will be moved to /usr/share below
+find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \;
 popd

+# Clean up non-python files
+rm -f %{buildroot}%{python2_sitelib}/sphinx/locale/.DS_Store
+rm -rf %{buildroot}%{python2_sitelib}/sphinx/locale/.tx
+rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
+rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
+
 # Deliver rst files
 rm -rf doc/_build
 sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
 mv doc reST
-rm reST/make.bat

 # Move language files to /usr/share;
 # patch to support this incorporated in 0.6.6
-pushd %{buildroot}%{python3_sitelib}
+pushd %{buildroot}%{python2_sitelib}

 for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
 do
-  test $lang == __pycache__ && continue
  install -d %{buildroot}%{_datadir}/sphinx/locale/$lang
  install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
  mv sphinx/locale/$lang/LC_MESSAGES/sphinx.js \
@@ -323,9 +503,36 @@ do
 done
 popd

-# Create the sphinxcontrib directory, so we can own it
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1669790 for rationale
-mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
+install -d %{buildroot}%{_modulesdir}/python-sphinx
+install -m 0644 %{SOURCE1} %{buildroot}%{_modulesdir}/python-sphinx/
+sed -i 's|@python2_sphinx_dir@|%{_libexecdir}/python2-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python2-sphinx
+install -m 0644 %{SOURCE2} %{buildroot}%{_modulesdir}/python-sphinx/
+sed -i 's|@python3_sphinx_dir@|%{_libexecdir}/python3-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python3-sphinx
+install -d %{buildroot}%{_sysconfdir}/profile.d
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
+install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
+
+%if %{py3_default}
+sed 's/@PYTHONVER@/3/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version
+
+# These symlinks establish a default for when a package is first installed (and
+# therefore, environment modules is not loaded).  The user can immediately
+# switch them by using module swap python-sphinx/python2-sphinx
+for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
+  ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename
+done
+
+%else
+sed 's/@PYTHONVER@/2/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version
+
+# These symlinks establish a default for when a package is first installed (and
+# therefore, environment modules is not loaded).  The user can immediately
+# switch them by using module swap python-sphinx/python3-sphinx
+for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
+  ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename
+done
+
+%endif

 %find_lang sphinx

@@ -338,231 +545,82 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib

 %if %{with tests}
 %check
-# Currently, all linkcheck tests and test_latex_images need internet
-%pytest \
-%if %{without internet}
-    -k "not linkcheck and not test_latex_images" \
-%endif
-;
-%endif
+export PYTHONPATH=$PWD
+
+# Currently, all linkcheck tests hit external websites.  Since network access
+# is disabled in koji, we have to disable these.
+rm tests/test_build_linkcheck.py
+
+# Igoring test_api_translator for now as it fails on Fedora.
+# The issue has been reported upstream: https://github.com/sphinx-doc/sphinx/issues/4710
+LANG=en_US.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py
+%if 0%{?with_python3}
+pushd %{py3dir}
+# Currently, all linkcheck tests hit external websites.  Since network access
+# is disabled in koji, we have to disable these.
+rm tests/test_build_linkcheck.py
+LANG=en_US.UTF-8 PYTHON=python3 make test
+popd
+%endif # with_python3
+%endif # with tests


-%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang
+%files latex
+%license LICENSE
+
+%files locale -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}.dist-info/
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
-%{_mandir}/man1/sphinx-*

+%files -n python2-sphinx
+%license LICENSE
+%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora
+%{_bindir}/sphinx-*-2*
+%{_bindir}/sphinx-build
+%{_bindir}/sphinx-apidoc
+%{_bindir}/sphinx-autogen
+%{_bindir}/sphinx-quickstart
+%{python2_sitelib}/sphinx/
+%{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/
+%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
+%{_mandir}/man1/*
+%{_libexecdir}/python2-sphinx/
+%{_modulesdir}/python-sphinx/python2-sphinx
+%if !%{py3_default}
+%{_modulesdir}/python-sphinx/.version
+%endif
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh

-%files -n python%{python3_pkgversion}-sphinx-latex
-# empty, this is a metapackage
+%if 0%{?with_python3}

+%files -n python3-sphinx
+%license LICENSE
+%doc AUTHORS CHANGES EXAMPLES README.rst README.fedora
+%{_bindir}/sphinx-*-3*
+%{python3_sitelib}/sphinx/
+%{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
+%{_mandir}/man1/sphinx-*-%{python3_version}.1*
+%{_libexecdir}/python3-sphinx/
+%{_modulesdir}/python-sphinx/python3-sphinx
+%if %{py3_default}
+%{_modulesdir}/python-sphinx/.version
+%endif
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
+%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
+
+%endif # with_python3

 %files doc
-%license LICENSE
 %doc html reST


 %changelog
-* Wed Feb 01 2023 Karolina Surma <ksurma@redhat.com> - 1:5.0.2-3
- Backport a fix for rendering double colons in Sphinx roles
- Fixes: rhbz#2166116
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jun 21 2022 Karolina Surma <ksurma@redhat.com> - 1:5.0.2-1
- Update to 5.0.2
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:4.5.0-3
- Rebuilt for Python 3.11
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:4.5.0-2
- Bootstrap for Python 3.11
-
-* Fri Apr 01 2022 Karolina Surma <ksurma@redhat.com> - 1:4.5.0-1
- Update to 4.5.0
- Fixes rhbz#2068924
-
-* 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/
- 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
-
-* Tue Dec 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-1
- Update to 2.2.2 (rhbz#1743018)
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-6
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-5
- Rebuilt for Python 3.8
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-4
- Bootstrap for Python 3.8
-
-* Thu Aug 15 2019 Richard Shaw <hobbes1069@gmail.com> - 1:2.1.2-3
- Rebuild for Python 3.8.
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Jun 23 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-1
- Update to 2.1.2 (#1716158)
-
-* Wed Apr 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.0.1-1
- Update to 2.0.1 (#1697544)
- Own the sphinxcontrib directory (#1669790)
-
-* Wed Mar 27 2019 Charalampos Stratakis <cstratak@redhat.com> - 1:2.0.0~b2-1
- Update to 2.0.0b2
-
-* Wed Feb 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.0.0~b1-1
- Update to 2.0.0b1
- Drop Python 2 package
- https://fedoraproject.org/wiki/Changes/Sphinx2
-
-* Thu Feb 07 2019 Alfredo Moralejo <amoralej@redhat.com> - 1:1.8.4-1
- Update to 1.8.4.
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.6-2
- Drop explicit locale setting for python3, use C.UTF-8 for python2
-  See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
-
-* Mon Jul 23 2018 Marcel Plch <mplch@redhat.com> - 1:1.7.6-1
- Update to 1.7.6
-
-* Fri Jul 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-6
- Remove unused dependencies on xapian and simplejson
-
-* Thu Jul  5 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.5-5
- Add patch to fix build if alabaster theme is installed
- Add patch for #1589868
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-4
- Enable tests
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-3
- Enable websupport
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-2
- Rebuilt for Python 3.7
-
 * Tue Jun 19 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.5-1
 - Update to 1.7.5 (bz#1570451)

-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-5
- Rebuilt for Python 3.7
-
-* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-4
- Bootstrap for Python 3.7
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-3
- Bootstrap for Python 3.7
-
 * Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-2
 - Conditionalize the ImageMagick build dependency & tests

--- a/6
+++ b/6
@@ -0,0 +1,6 @@
+#%Module 1.0
+#
+#  python2-sphinx module for use with 'environment modules' package
+#
+conflict        python-sphinx
+prepend-path    PATH            @python2_sphinx_dir@
--- a/6
+++ b/6
@@ -0,0 +1,6 @@
+#%Module 1.0
+#
+#  python2-sphinx module for use with 'environment modules' package
+#
+conflict        python-sphinx
+prepend-path    PATH            @python3_sphinx_dir@
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -1,4 +0,0 @@
-# exclude XML template (not always valid) from XML validity check:
-xml:
-    ignore:
-        - /usr/lib/python*/site-packages/sphinx/themes/basic/opensearch.xml
--- a/2
+++ b/2
@@ -1 +1 @@
-SHA512 (Sphinx-5.0.2.tar.gz) = d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6
+SHA512 (Sphinx-1.7.5.tar.gz) = db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
--- a/sphinx-test_theming.diff
+++ b/sphinx-test_theming.diff
@@ -1,12 +0,0 @@
-diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py
--- Sphinx-1.7.6/tests/test_theming.py	2018-07-16 11:24:40.000000000 +0200
-+++ Sphinx-1.7.6_patched/tests/test_theming.py	2018-07-20 15:17:35.049263077 +0200
-@@ -25,7 +25,7 @@
-         themes.append('alabaster')
- 
-     # test Theme class API
-    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'
--- a/xfail-test_latex_remote_images.patch
+++ b/xfail-test_latex_remote_images.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
+index 55f48cd..78ccecd 100644
+--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
+@@ -1009,7 +1009,7 @@ def test_latex_raw_directive(app, status, warning):
+     assert 'HTML: abc  ghi' in result
+     assert 'LaTeX: abc def ghi' in result
+ 
+-
+@pytest.mark.xfail(reason="this test requires internet connection")
+ @pytest.mark.sphinx('latex', testroot='images')
+ def test_latex_remote_images(app, status, warning):
+     app.builder.build_all()
--- a/zz-modules-python-sphinx.csh
+++ b/zz-modules-python-sphinx.csh
@@ -0,0 +1,2 @@
+# Add path to the default python-sphinx scripts on this version of Fedora
+module load python-sphinx >& /dev/null
--- a/zz-modules-python-sphinx.sh
+++ b/zz-modules-python-sphinx.sh
@@ -0,0 +1,2 @@
+# Add path to the default python-sphinx scripts on this version of Fedora
+module load python-sphinx 2> /dev/null