From a0cc515b741eeff308e8f0c862c251c6829e7a5a Mon Sep 17 00:00:00 2001
From: Karolina Surma <ksurma@redhat.com>
Date: Tue, 21 Jun 2022 11:55:21 +0200
Subject: [PATCH] Update to 5.0.2

---
 .gitignore               |  1 +
 10336.patch              | 23 -----------------------
 python-sphinx.spec       | 11 +++++------
 sources                  |  2 +-
 sphinx-test_theming.diff |  2 +-
 5 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 10336.patch

diff --git a/.gitignore b/.gitignore
index cc02dd5..99f1348 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 /Sphinx-4.3.1.tar.gz
 /Sphinx-4.4.0.tar.gz
 /Sphinx-4.5.0.tar.gz
+/Sphinx-5.0.2.tar.gz
diff --git a/10336.patch b/10336.patch
deleted file mode 100644
index f79d764..0000000
--- a/10336.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a314927e7451c255f7d4678feef32048dab5f9b2 Mon Sep 17 00:00:00 2001
-From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
-Date: Sat, 9 Apr 2022 20:38:47 +0100
-Subject: [PATCH] Fix test_restify
-
----
- sphinx/util/typing.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
-index 1534b2c8ee..8e48b184bc 100644
---- a/sphinx/util/typing.py
-+++ b/sphinx/util/typing.py
-@@ -215,6 +215,9 @@ def _restify_py37(cls: Optional[Type], mode: str = 'fully-qualified-except-typin
-         return text
-     elif isinstance(cls, typing._SpecialForm):
-         return ':py:obj:`~%s.%s`' % (cls.__module__, cls._name)
-+    elif sys.version_info >= (3, 11) and cls is typing.Any:
-+        # handle bpo-46998
-+        return f':py:obj:`~{cls.__module__}.{cls.__name__}`'
-     elif hasattr(cls, '__qualname__'):
-         if cls.__module__ == 'typing':
-             return ':py:class:`~%s.%s`' % (cls.__module__, cls.__qualname__)
diff --git a/python-sphinx.spec b/python-sphinx.spec
index 72edb53..addc958 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -24,11 +24,11 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-%global     general_version 4.5.0
+%global     general_version 5.0.2
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    3%{?dist}
+Release:    1%{?dist}
 Epoch:      1
 Summary:    Python documentation generator
 
@@ -45,10 +45,6 @@ Source0:    %{pypi_source %{upstream_name} %{upstream_version}}
 # which causes that test to fail.
 Patch1:     sphinx-test_theming.diff
 
-# Fix test_restify for Python 3.11
-# https://github.com/sphinx-doc/sphinx/pull/10336
-Patch2:     https://github.com/sphinx-doc/sphinx/pull/10336.patch
-
 BuildArch:     noarch
 
 BuildRequires: make
@@ -368,6 +364,9 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index d5a34f0..3452c44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Sphinx-4.5.0.tar.gz) = b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
+SHA512 (Sphinx-5.0.2.tar.gz) = d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6
diff --git a/sphinx-test_theming.diff b/sphinx-test_theming.diff
index 18e3cb0..975305e 100644
--- a/sphinx-test_theming.diff
+++ b/sphinx-test_theming.diff
@@ -1,7 +1,7 @@
 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
-@@ -31,7 +31,7 @@
+@@ -25,7 +25,7 @@
          themes.append('alabaster')
  
      # test Theme class API