Update to 3.3.1

.gitignore

@@ -25,3 +25,4 @@
 /Sphinx-3.1.1.tar.gz
 /Sphinx-3.1.2.tar.gz
 /Sphinx-3.2.1.tar.gz
+/Sphinx-3.3.1.tar.gz

85b24a2e88ea71edc728aff3b078d34c2f374f06.patch

@@ -1,36 +0,0 @@
-From 85b24a2e88ea71edc728aff3b078d34c2f374f06 Mon Sep 17 00:00:00 2001
-From: Takeshi KOMIYA <i.tkomiya@gmail.com>
-Date: Sun, 13 Sep 2020 09:16:32 +0900
-Subject: [PATCH] Fix our test failed with pygments-2.7.0
-
-Since pygments-2.7.0, it has changed the style of output HTML.
-That makes our test broken.  This fixes it to pass with new pygments.
----
- tests/test_build_html.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_build_html.py b/tests/test_build_html.py
-index e949f11572..1efc6c14a6 100644
---- a/tests/test_build_html.py
-+++ b/tests/test_build_html.py
-@@ -10,8 +10,10 @@
- 
- import os
- import re
-+from distutils.version import LooseVersion
- from itertools import cycle, chain
- 
-+import pygments
- import pytest
- from html5lib import HTMLParser
- 
-@@ -1591,4 +1593,8 @@ def test_html_codeblock_linenos_style_inline(app):
-     app.build()
-     content = (app.outdir / 'index.html').read_text()
- 
--    assert '<span class="lineno">1 </span>' in content
-+    pygments_version = tuple(LooseVersion(pygments.__version__).version)
-+    if pygments_version > (2, 7):
-+        assert '<span class="linenos">1</span>' in content
-+    else:
-+        assert '<span class="lineno">1 </span>' in content

python-sphinx.spec

@@ -21,11 +21,11 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-%global     general_version 3.2.1
+%global     general_version 3.3.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,11 +42,6 @@ Source0:    %{pypi_source %{upstream_name} %{upstream_version}}
 # which causes that test to fail.
 Patch1:     sphinx-test_theming.diff
 
-# Latest version of python-pygments (2.7.1) breaks python-sphinx.
-# It is already fixed in upstream and this patch can be removed
-# once new version of python-sphinx is released.
-Patch2:     https://github.com/sphinx-doc/sphinx/commit/85b24a2e88ea71edc728aff3b078d34c2f374f06.patch
-
 BuildArch:     noarch
 
 BuildRequires: python%{python3_pkgversion}-devel
@@ -162,7 +157,7 @@ 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
 
@@ -388,6 +383,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
+SHA512 (Sphinx-3.3.1.tar.gz) = bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78