- Few minor tweaks to Gareth's spec file update

Mon May 10 2010 Gareth Armstrong <gareth.armstrong@hp.com> - 0.6.5-1.hp
- Update to 0.6.5
- Initial import of python-sphinx from Fedora Rawhide for use in HP CMS
- Enforce that Sphinx requires Python 2.4 or later via an explicit BR
- Minor tweaks to spec file
- Move language files to %%{_datadir}, idea borrowed from Debian's sphinx
    package
- Deliver man pages for sphinx-build & sphinx-quickstart
- Deliver rst documentation files to reST directory in doc sub-package
- Add %%check section for Python2 and add BR on python-nose

.cvsignore

@@ -0,0 +1 @@
+Sphinx-0.6.5.tar.gz

.gitignore

@@ -1,43 +0,0 @@
-/Sphinx-1.2.3.tar.gz
-/Sphinx-1.3.1.tar.gz
-/Sphinx-1.4.4.tar.gz
-/Sphinx-1.4.5.tar.gz
-/Sphinx-1.4.6.tar.gz
-/Sphinx-1.4.8.tar.gz
-/Sphinx-1.4.9.tar.gz
-/Sphinx-1.5.1.tar.gz
-/Sphinx-1.5.2.tar.gz
-/Sphinx-1.6.3.tar.gz
-/Sphinx-1.6.4.tar.gz
-/Sphinx-1.6.5.tar.gz
-/Sphinx-1.6.6.tar.gz
-/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
-/Sphinx-5.1.1.tar.gz
-/Sphinx-5.2.3.tar.gz
-/Sphinx-5.3.0.tar.gz

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: python-sphinx
+# $Id$
+NAME := python-sphinx
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

branch

@@ -0,0 +1 @@
+F-12

fix-tests-with-pygments-2.14.patch

@@ -1,114 +0,0 @@
-From c3bf917fcf18c5211b220a7b294b7e6012c2d510 Mon Sep 17 00:00:00 2001
-From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
-Date: Sun, 1 Jan 2023 19:17:03 +0000
-Subject: [PATCH] Fix tests for Pygments 2.14
-
-Pygments 2.14 was released on 01/01/2023 [0]
-
-[0]: https://pygments.org/docs/changelog/#version-2-14-0
-
----
- pyproject.toml             |  2 +-
- tests/test_ext_viewcode.py | 27 +++++++++++++++++++--------
- tests/test_intl.py         | 11 +++++++++--
- 3 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 0e059b5..c02ce20 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -64,7 +64,7 @@ dependencies = [
-     "sphinxcontrib-serializinghtml>=1.1.5",
-     "sphinxcontrib-qthelp",
-     "Jinja2>=3.0",
--    "Pygments>=2.12",
-+    "Pygments>=2.13",
-     "docutils>=0.14,<0.20",
-     "snowballstemmer>=2.0",
-     "babel>=2.9",
-diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py
-index 7750b8d..6d443d1 100644
---- a/tests/test_ext_viewcode.py
-+++ b/tests/test_ext_viewcode.py
-@@ -2,6 +2,7 @@
- 
- import re
- 
-+import pygments
- import pytest
- 
- 
-@@ -31,14 +32,24 @@ def test_viewcode(app, status, warning):
- 
-     result = (app.outdir / '_modules/spam/mod1.html').read_text(encoding='utf8')
-     result = re.sub('<span class=".*?">', '<span>', result)  # filter pygments classes
--    assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
--            'href="../../index.html#spam.Class1">[docs]</a>'
--            '<span>@decorator</span>\n'
--            '<span>class</span> <span>Class1</span>'
--            '<span>(</span><span>object</span><span>):</span>\n'
--            '    <span>&quot;&quot;&quot;</span>\n'
--            '<span>    this is Class1</span>\n'
--            '<span>    &quot;&quot;&quot;</span></div>\n') in result
-+    if pygments.__version__ >= '2.14.0':
-+        assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
-+                'href="../../index.html#spam.Class1">[docs]</a>'
-+                '<span>@decorator</span>\n'
-+                '<span>class</span> <span>Class1</span>'
-+                '<span>(</span><span>object</span><span>):</span>\n'
-+                '<span>    </span><span>&quot;&quot;&quot;</span>\n'
-+                '<span>    this is Class1</span>\n'
-+                '<span>    &quot;&quot;&quot;</span></div>\n') in result
-+    else:
-+        assert ('<div class="viewcode-block" id="Class1"><a class="viewcode-back" '
-+                'href="../../index.html#spam.Class1">[docs]</a>'
-+                '<span>@decorator</span>\n'
-+                '<span>class</span> <span>Class1</span>'
-+                '<span>(</span><span>object</span><span>):</span>\n'
-+                '    <span>&quot;&quot;&quot;</span>\n'
-+                '<span>    this is Class1</span>\n'
-+                '<span>    &quot;&quot;&quot;</span></div>\n') in result
- 
- 
- @pytest.mark.sphinx('epub', testroot='ext-viewcode')
-diff --git a/tests/test_intl.py b/tests/test_intl.py
-index 796d95b..0c4b838 100644
---- a/tests/test_intl.py
-+++ b/tests/test_intl.py
-@@ -6,6 +6,7 @@ Runs the text builder in the test root.
- import os
- import re
- 
-+import pygments
- import docutils
- import pytest
- from babel.messages import mofile, pofile
-@@ -1105,8 +1106,11 @@ def test_additional_targets_should_not_be_translated(app):
-     expected_expr = ("""<span class="n">literal</span>"""
-                      """<span class="o">-</span>"""
-                      """<span class="n">block</span>\n"""
--                     """<span class="k">in</span> """
-+                     """<span class="k">in</span>"""
-+                     """<span class="w"> </span>"""
-                      """<span class="n">list</span>""")
-+    if pygments.__version__ < '2.14.0':
-+        expected_expr = expected_expr.replace("""<span class="w"> </span>""", ' ')
-     assert_count(expected_expr, result, 1)
- 
-     # doctest block should not be translated but be highlighted
-@@ -1184,8 +1188,11 @@ def test_additional_targets_should_be_translated(app):
-     expected_expr = ("""<span class="no">LITERAL</span>"""
-                      """<span class="o">-</span>"""
-                      """<span class="no">BLOCK</span>\n"""
--                     """<span class="no">IN</span> """
-+                     """<span class="no">IN</span>"""
-+                     """<span class="w"> </span>"""
-                      """<span class="no">LIST</span>""")
-+    if pygments.__version__ < '2.14.0':
-+        expected_expr = expected_expr.replace("""<span class="w"> </span>""", ' ')
-     assert_count(expected_expr, result, 1)
- 
-     # doctest block should not be translated but be highlighted
--- 
-2.39.1
-

python-sphinx-0.6.5_move_locale_files_outside_sitelib.patch

@@ -0,0 +1,56 @@
+# HG changeset patch
+# Parent 552e51b26229a9a918c76a401f2f487bf81f2ee6
+
+Index: Sphinx-0.6.5/sphinx/builders/html.py
+===================================================================
+--- Sphinx-0.6.5.orig/sphinx/builders/html.py
++++ Sphinx-0.6.5/sphinx/builders/html.py
+@@ -10,6 +10,7 @@
+ """
+ 
+ import os
++import sys
+ import codecs
+ import posixpath
+ import cPickle as pickle
+@@ -91,10 +92,15 @@ class StandaloneHTMLBuilder(Builder):
+             self.link_suffix = self.out_suffix
+ 
+         if self.config.language is not None:
+-            jsfile = path.join(package_dir, 'locale', self.config.language,
+-                               'LC_MESSAGES', 'sphinx.js')
+-            if path.isfile(jsfile):
+-                self.script_files.append('_static/translations.js')
++            jsfile_list = [path.join(package_dir, 'locale',
++                self.config.language, 'LC_MESSAGES', 'sphinx.js'),
++                path.join(sys.prefix, 'share/sphinx/locale',
++                    self.config.language, 'sphinx.js')]
++
++            for jsfile in jsfile_list:
++                if path.isfile(jsfile):
++                    self.script_files.append('_static/translations.js')
++                    break
+ 
+     def init_templates(self):
+         Theme.init_themes(self)
+@@ -528,11 +534,15 @@ class StandaloneHTMLBuilder(Builder):
+         f.close()
+         # then, copy translations JavaScript file
+         if self.config.language is not None:
+-            jsfile = path.join(package_dir, 'locale', self.config.language,
+-                               'LC_MESSAGES', 'sphinx.js')
+-            if path.isfile(jsfile):
+-                copyfile(jsfile, path.join(self.outdir, '_static',
+-                                           'translations.js'))
++            jsfile_list = [path.join(package_dir, 'locale',
++                self.config.language, 'LC_MESSAGES', 'sphinx.js'),
++                path.join(sys.prefix, 'share/sphinx/locale',
++                    self.config.language, 'sphinx.js')]
++            for jsfile in jsfile_list:
++                if path.isfile(jsfile):
++                    copyfile(jsfile, path.join(self.outdir, '_static',
++                                               'translations.js'))
++                    break
+         # then, copy over all user-supplied static files
+         if self.theme:
+             staticdirnames = [path.join(themepath, 'static')

python-sphinx-0.6.5_setuptools.patch

@@ -0,0 +1,24 @@
+# HG changeset patch
+# Parent 5da6d572bd088b04711b3bf70991c976d8f9c605
+
+Index: Sphinx-0.6.5/setup.py
+===================================================================
+--- Sphinx-0.6.5.orig/setup.py
++++ Sphinx-0.6.5/setup.py
+@@ -1,10 +1,13 @@
+ # -*- coding: utf-8 -*-
+-import ez_setup
+-ez_setup.use_setuptools()
++try:
++    from setuptools import setup, find_packages
++except ImportError:
++    import ez_setup
++    ez_setup.use_setuptools()
++    from setuptools import setup, find_packages
+ 
+ import os
+ import sys
+-from setuptools import setup, find_packages
+ from distutils import log
+ 
+ import sphinx

python-sphinx.spec

@@ -1,113 +1,31 @@
-# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-# Without it we have warnings in docs, but it's not a hard dependency
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%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%{?rhel} > 7
-# Build without BuildRequires ImageMagick, to skip imgconverter tests
-%bcond_with imagemagick_tests
-%else
-%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 5.3.0
+Version:    0.6.5
-#global     prerel ...
+Release:    2%{?dist}
-%global     upstream_version %{general_version}%{?prerel}
-Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    3%{?dist}
-Epoch:      1
 Summary:    Python documentation generator
 
-# Unless otherwise noted, the license for code is BSD
+Group:      Development/Tools
-# sphinx/util/inspect.py has bits licensed with PSF license v2 (Python)
+License:    BSD
-# sphinx/themes/haiku/static/haiku.css_t has bits licensed with MIT
+URL:        http://sphinx.pocoo.org/
-# JS: JQuery, Underscore, css3-mediaqueries are available under MIT
+Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
-License:    BSD and Python and MIT
+Patch0:     %{name}-0.6.5_setuptools.patch
-
+Patch1:     %{name}-0.6.5_move_locale_files_outside_sitelib.patch
-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
-
-# Backported upstream commit included in Sphinx 6+ ensures compatibility
-# with python-pygments 2.14+
-# https://github.com/sphinx-doc/sphinx/commit/965768bfda2a00ba6
-Patch2:     fix-tests-with-pygments-2.14.patch
 
+BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:     noarch
-
+BuildRequires: python2-devel >= 2.4
-BuildRequires: make
+BuildRequires: python-setuptools
-BuildRequires: python%{python3_pkgversion}-devel
+BuildRequires: python-docutils
-BuildRequires: pyproject-rpm-macros
+BuildRequires: python-jinja2
-
+BuildRequires: python-nose
-%if %{with websupport}
+Requires:      python-docutils
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
+Requires:      python-jinja2
-%endif
+Requires:      python-pygments
-
-# for fixes
-BuildRequires: dos2unix
-
-%if %{with tests}
-# tests import _testcapi
-BuildRequires: python%{python3_pkgversion}-test
-
-BuildRequires: gcc
-BuildRequires: gettext
-BuildRequires: graphviz
-BuildRequires: texinfo
-
-%if %{with imagemagick_tests}
-BuildRequires: ImageMagick
-%endif
-
-%if %{with latex_tests}
-BuildRequires: texlive-collection-fontsrecommended
-BuildRequires: texlive-collection-latex
-BuildRequires: texlive-dvipng
-BuildRequires: texlive-dvisvgm
-BuildRequires: tex(amsmath.sty)
-BuildRequires: tex(amsthm.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(tabulary.sty)
-BuildRequires: tex(titlesec.sty)
-BuildRequires: tex(upquote.sty)
-BuildRequires: tex(utf8x.def)
-BuildRequires: tex(wrapfig.sty)
-%endif
-%endif
 
 
 %description
@@ -139,99 +57,12 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%package -n python%{python3_pkgversion}-sphinx
-Summary:       Python documentation generator
-
-Recommends:    graphviz
-Recommends:    ImageMagick
-
-# 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
-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.
-
-
-%package -n python%{python3_pkgversion}-sphinx-latex
-Summary:       LaTeX builder dependencies for python%{python3_pkgversion}-sphinx
-
-Requires:      python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
-Requires:      texlive-collection-fontsrecommended
-Requires:      texlive-collection-latex
-Requires:      texlive-dvipng
-Requires:      texlive-dvisvgm
-Requires:      tex(amsmath.sty)
-Requires:      tex(amsthm.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(tabulary.sty)
-Requires:      tex(titlesec.sty)
-Requires:      tex(upquote.sty)
-Requires:      tex(utf8x.def)
-Requires:      tex(wrapfig.sty)
-
-# 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
-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 pulls in the TeX dependencies needed by Sphinx's LaTeX
-builder.
-
-
 %package doc
-Summary:       Documentation for %{name}
+Summary:    Documentation for %{name}
-License:       BSD
+Group:      Documentation
-Recommends:    python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
+License:    BSD
+Requires:   %{name} = %{version}-%{release}
+
 
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -241,70 +72,46 @@ 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 documentation in the HTML format.
+This package contains documentation in reST and HTML formats.
 
 
 %prep
-%autosetup -n %{upstream_name}-%{upstream_version} -p1
+%setup -q -n %{upstream_name}-%{version}
-
+%patch0 -p1 -b .setuptools
-# fix line encoding of bundled jquery.js
+%patch1 -p1 -b .language_files
-dos2unix -k ./sphinx/themes/basic/static/jquery.js
-
-%if %{without imagemagick_tests}
-rm tests/test_ext_imgconverter.py
-%endif
-
-
-%generate_buildrequires
-%pyproject_buildrequires -r %{?with_tests:-x test}
 
+sed '1d' -i sphinx/pycode/pgen2/token.py
 
 %build
-%pyproject_wheel
+%{__python} setup.py build
-
-export PYTHONPATH=$PWD
 pushd doc
-export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py"
+make html
-make html SPHINXBUILD="$SPHINXBUILD"
-make man SPHINXBUILD="$SPHINXBUILD"
 rm -rf _build/html/.buildinfo
-# Those files are copied to _build/html/_images and loaded to the
-# html pages from there - we can safely remove the duplicated and unused files
-rm -rf _build/html/_static/themes _build/html/_static/tutorial
-rm -f _build/html/_static/more.png _build/html/_static/translation.svg
 mv _build/html ..
+rm -rf _*
 popd
 
 
 %install
-%pyproject_install
+rm -rf %{buildroot}
 
-# For backwards compatibility. Remove with care, if at all
+%{__python} setup.py install --skip-build --root %{buildroot}
-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
-done
 
-# Clean up non-python files
-rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
-rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
 
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
-for f in _build/man/sphinx-*.1;
+mv sphinx-*.1 %{buildroot}%{_mandir}/man1/
-do
-    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f)
-done
 popd
 
-# Move language files to /usr/share;
+# Deliver rst files
-# patch to support this incorporated in 0.6.6
+mv doc reST
-pushd %{buildroot}%{python3_sitelib}
 
-for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
+# Move language files to /usr/share in association with %patch1
+pushd %{buildroot}%{python_sitelib}
+
+for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -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 \
@@ -314,11 +121,6 @@ do
   rm -rf sphinx/locale/$lang
 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
-
 %find_lang sphinx
 
 # Language files; Since these are javascript, it's not immediately obvious to
@@ -328,517 +130,29 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
   >> sphinx.lang
 
 
-%if %{with tests}
+%clean
+rm -rf %{buildroot}
+
+
 %check
-# Currently, all linkcheck tests and test_latex_images need internet
+make test
-# test_build_latex_doc needs internet to download pictures,
-# but fails also with it enabled, we decided to skip it entirely
-%pytest \
-%if %{without internet}
-    -k "not linkcheck and not test_latex_images and not test_build_latex_doc" \
-%endif
-;
-%endif
 
 
-%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang
+%files -f sphinx.lang
-%license LICENSE
+%defattr(-,root,root,-)
-%doc AUTHORS CHANGES EXAMPLES README.rst
+%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
 %{_bindir}/sphinx-*
-%{python3_sitelib}/sphinx/
+%{python_sitelib}/*
-%dir %{python3_sitelib}/sphinxcontrib/
+%{_datadir}/sphinx/
-%{python3_sitelib}/sphinx-%{upstream_version}.dist-info/
+%exclude %{_datadir}/sphinx/locale/*/sphinx.js
-%dir %{_datadir}/sphinx/
+%{_mandir}/man1/*
-%dir %{_datadir}/sphinx/locale
-%dir %{_datadir}/sphinx/locale/*
-%{_mandir}/man1/sphinx-*
-
-
-%files -n python%{python3_pkgversion}-sphinx-latex
-# empty, this is a metapackage
-
 
 %files doc
-%license LICENSE
+%defattr(-,root,root,-)
-%doc html
+%doc html reST
 
 
 %changelog
-* Tue Jan 31 2023 Karolina Surma <ksurma@redhat.com> - 1:5.3.0-3
-- Fix tests with python-pygments 2.14+
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Nov 08 2022 Karolina Surma <ksurma@redhat.com> - 1:5.3.0-1
-- Update to 5.3.0
-- Fixes rhbz#2129546
-
-* Mon Aug 15 2022 Karolina Surma <ksurma@redhat.com> - 1:5.1.1-1
-- Update to 5.1.1
-- Fixes rhbz#2110473
-- Remove reST documentation from the -doc package, ship only HTML
-
-* 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
-
-* Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-1
-- Update to 1.7.2 (bz#1558968)
-
-* Tue Mar 13 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.1-1
-- Update to 1.7.1 (bz#1534802)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 09 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.6-1
-- Update to 1.6.6 (bz#1532435)
-
-* Mon Dec 11 2017 Iryna Shcherbina <ishcherb@redhat.com> - 1:1.6.5-2
-- Fix ambiguous Python 2 dependency declarations
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Mon Nov 06 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.5-1
-- Update to 1.6.5 (bz#1508237)
-
-* Mon Oct 09 2017 Troy Dawson <tdawson@redhat.com> - 1:1.6.4-2
-- Cleanup spec file conditionals
-
-* Tue Sep 26 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.4-1
-- Update to 1.6.4 (bz#1426928)
-
-* Wed Sep 20 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.3-3
-- Provide the epoch tag in order to keep the upgrade path clean.
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jul 20 2017 Charalampos Stratakis <cstratak@redhat.com> - - 1.6.3-1
-- Update to 1.6.3 (bz#1426928)
-
-* Sat Feb 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-2
-- Cleanup source files that should not be installed
-- Fix the __init__.pyc that was byte compiled for the wrong python
-
-* Fri Feb 17 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-1
-- Update to 1.5.2
-- Remove a few latex dependencies that are no longer needed
-- Remove xapian patch; now in upstream tarball
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jan 31 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-5
-- environment-modules is less featureful than Lmod.
-  - Select the default version in a different way since environment-modules
-    didn't understand the symlink
-  - Ignore error messsages in the shell startup script as environment-modules
-    prints an error message if a module has already been loaded.  The command
-    is doing the right thing for this case except that it's also printing an
-    error message.
-
-* Thu Jan 26 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-4
-- Add recipe for setting the system default to the README.fedora
-
-* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-3
-- Move the unversioned executables into the python2 package as they are now
-  using python2 to run
-
-* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-2
-- Add README.fedora so people know how to use environment-modules to switch.
-- Change the default to be the python2 version to match with the guidelines
-- Switch to generic environment(modules) instead of Lmod specifically.
-
-* Fri Dec 30 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-1
-- Update to 1.5.1
-
-* Fri Dec 30 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.9-2
-- Remove alternatives.  Alternatives should only be used for a very small
-  number of packages (system daemons which also have a compatible command line
-  interface).
-- Use environment-modules to switch between the python2 and python3 packages
-  *but* be aware that no amount of manual switching can get this 100% right.
-  The code has to be fixed upstream, not in packaging.
-
-* Tue Dec 13 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.4.9-1
-- Update to 1.4.9
-- Enable python3 tests
-
-* Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.4.8-3
-- Rebuild for Python 3.6
-- Disable python3 tests for now
-
-* Thu Oct 6 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.8-2
-- Added tex(luatex85.sty) dependency to support TexLive 2016
-
-* Thu Oct 6 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.8-1
-- Update to 1.4.8
-- Alternatives fails for scripts sometimes (bz#1382405)
-
-* Sun Sep 4 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.6-2
-- Alternatives fails for man pages due to existing files
-
-* Fri Sep 2 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.6-1
-- Update to 1.4.6 (bz#1370810)
-- Fix unversioned Obsoletes
-- Add alternatives slaves for man pages
-
-* Fri Aug 12 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.5-1
-- Update to 1.4.5 (bz#1356336)
-- Remove Recommends for latex, locale, and doc subpackages (bz#1366624)
-- Remove Requires from locale subpackage (bz#1366624)
-- Set executable scripts via alternatives  (bz#1321413)
-- Change graphviz Requires to Recommends (bz#1366706)
-
-* Sun Jul 03 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.4-2
-- doc and locale no longer specifically require python2-sphinx
-- Colapsed python3-sphinx-latex into python-latex
-
-* Sun Jun 12 2016 Avram Lubkin <aviso@fedoraproject.org> - 1.4.4-1
-- Updated to 1.4.4
-- Added python-sphinx-locale for common locale files
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Nov 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-4
-- Obsolete napoleon extension, it is now packaged with sphinx (#1286275)
-- Rename python2-Sphinx to python2-sphinx
-- Add conflicts to disallow parallel installation of different versions,
-  which causes file conflicts because of the shared documentation files.
-
-* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-3
-- Restore using python2 scripts by default (#1285535)
-
-* Wed Nov 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.1-2
-- Fix requirements of python2- subpackage
-- Provide sphinx-*-{3.5,3} symlinks for each script
-
-* Tue Nov 24 2015 Julien Enselme <jujens@jujens.eu> - 1.3.1-1
-- Update to 1.3.1 (#1136284)
-- Update to new guidelines
-- Make the default executable use python3
-
-* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 1.2.3-5
-- Rebuilt for Python3.5 rebuild
-- add patch to reflect that Python3.5 dropped HTMLParserError
-
-* Mon Jul 20 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-4
-- Fix line encoding of bundled jquery.js
-
-* Mon Jul 20 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-3
-- Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Feb  5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-1
-- Update to 1.2.3
-- Mark license file with %%license instead of %%doc
-
-* Thu Feb  5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-10
-- Complete LaTeX builder deps (fixes bz#882166)
-- Make test output verbose
-- Add BRs needed to enable all tests
-
-* Tue Feb  3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-9
-- python3-sphinx package also Provides: python3-sphinx-latex
-
-* Tue Feb  3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-8
-- If a separate LaTeX subpackage is not generated, the main package should have
-  a virtual Provides: for it (bz#1187989)
-
-* Tue Jan 27 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-7
-- Disable separate LaTeX builder for now (bz#1185574)
-
-* Thu Jan 22 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-6
-- Split off LaTeX builder into its own subpackages, to remove TeXLive
-  dependencies from the main package.
-  Thanks to Robert Kuska <rkuska@redhat.com> for feedback
-- Clean up python3-sphinx's locale files, they ended up in the python2 package.
-  Share the locale files in /usr/share instead
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue May 27 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.2-4
-- Don't own the -3 scripts by python 2 package
-
-* Thu May 22 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.2-3
-- Add sphinx-*-3 links to scripts
-Resolves: #1098109
-
-* Fri May  9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-2
-- Rebuild for Python 3.4
-
-* Fri May  9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-1
-- Update to 1.2.2
-
-* Thu Feb 13 2014 Michel Salim <salimma@fedoraproject.org> - 1.2.1-1
-- Update to 1.2.1
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Mar  9 2013 Michel Salim <salimma@fedoraproject.org> - 1.1.3-7
-- Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Aug 21 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.3-5
-- Fix for use of sphinx's manpage writer with docutils-0.10
-
-* Mon Aug  6 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-4
-- Rebuild for Python 3.3
-
-* Fri Aug  3 2012 David Malcolm <dmalcolm@redhat.com> - 1.1.3-3
-- remove rhel logic from with_python3 conditional
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Apr  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-1
-- Update to 1.1.3
-
-* Sun Feb  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.2-5
-- Move python3 runtime dependencies to the right subpackage
-- Properly exclude python3 binaries
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sat Dec 17 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-3
-- BR on texlive-latex for LaTeX tests
-
-* Thu Dec  8 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-2
-- Enable python3 subpackage
-
-* Mon Nov 28 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.2-1
-- Update to upstream 1.1.2
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jan 18 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0.7-1
-- Update to upstream 1.0.7
-
-* Mon Jan 17 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0.6-1
-- Update to upstream 1.0.6
-
-* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-3
-- Fix -doc Makefile to allow regeneration of .rst files
-
-* Mon Nov  1 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-2
-- Actually include *.js locale files
-- Generate manpages
-
-* Fri Sep 17 2010 Michel Salim <salimma@fedoraproject.org> - 1.0.4-1
-- Update to 1.0.4
-- Remove BuildRoot and %%clean declarations
-
-* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.0-0.1.b2.1
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Mon May 31 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.0-0.2.b2
-- Update to 1.0 beta 2
-- Fixes problem building html documentation in non-English locales
-
-* Wed May 26 2010 Michel Salim <salimma@fedoraproject.org> - 1.0-0.1.b1
-- Update to 1.0 beta 1
-
-* Tue May 25 2010 Michel Salim <salimma@fedoraproject.org> - 0.6.6-1
-- Update to 0.6.6
-
 * Fri May 21 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.5-2
 - Few minor tweaks to Gareth's spec file update
 

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

sources

@@ -1 +1 @@
-SHA512 (Sphinx-5.3.0.tar.gz) = cd2321409f7566c6333d6fc5c4eb4ed2d07490923b0c8762a31f062d9e5d86bbd9bd2c2bb3b93a00b37f31940173404dba8259de940fe402a248cf66a72cd7ae
+86dd5dbd55cb44d1f8091a4a1c3743b2  Sphinx-0.6.5.tar.gz

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'