Update to 6.2.1

.gitignore

@@ -42,3 +42,4 @@
 /Sphinx-5.2.3.tar.gz
 /Sphinx-5.3.0.tar.gz
 /Sphinx-6.1.3.tar.gz
+/Sphinx-6.2.1.tar.gz

fix-tests-with-babel-2.12.patch

@@ -1,48 +0,0 @@
-From c5641702b552d71bc99c1ba3b45073488a30d398 Mon Sep 17 00:00:00 2001
-From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
-Date: Sun, 5 Mar 2023 13:32:37 +0000
-Subject: [PATCH] Update tests for Babel 2.12 (CLDR 42)
-
----
- tests/test_util_i18n.py | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_util_i18n.py b/tests/test_util_i18n.py
-index e52e27671d8..7be6f3e779a 100644
---- a/tests/test_util_i18n.py
-+++ b/tests/test_util_i18n.py
-@@ -4,12 +4,15 @@
- import os
- import warnings
- 
-+import babel
- import pytest
- from babel.messages.mofile import read_mo
- 
- from sphinx.errors import SphinxError
- from sphinx.util import i18n
- 
-+BABEL_VERSION = tuple(map(int, babel.__version__.split('.')))
-+
- 
- def test_catalog_info_for_file_and_path():
-     cat = i18n.CatalogInfo('path', 'domain', 'utf-8')
-@@ -78,10 +81,16 @@ def test_format_date():
-     format = '%x'
-     assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016'
-     format = '%X'
--    assert i18n.format_date(format, date=datet, language='en') == '5:11:17 AM'
-+    if BABEL_VERSION >= (2, 12):
-+        assert i18n.format_date(format, date=datet, language='en') == '5:11:17\u202fAM'
-+    else:
-+        assert i18n.format_date(format, date=datet, language='en') == '5:11:17 AM'
-     assert i18n.format_date(format, date=date, language='en') == 'Feb 7, 2016'
-     format = '%c'
--    assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17 AM'
-+    if BABEL_VERSION >= (2, 12):
-+        assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17\u202fAM'
-+    else:
-+        assert i18n.format_date(format, date=datet, language='en') == 'Feb 7, 2016, 5:11:17 AM'
-     assert i18n.format_date(format, date=date, language='en') == 'Feb 7, 2016'
- 
-     # timezone

python-sphinx.spec

@@ -24,11 +24,11 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-%global     general_version 6.1.3
+%global     general_version 6.2.1
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    4%{?dist}
+Release:    1%{?dist}
 Epoch:      1
 Summary:    Python documentation generator
 
@@ -44,10 +44,6 @@ Source:     %{pypi_source %{upstream_name} %{upstream_version}}
 Patch:      sphinx-test_theming.diff
 
 
-# Backported upstream commit ensures compatibility with Babel 2.12
-# https://github.com/sphinx-doc/sphinx/commit/c5641702b
-Patch:      fix-tests-with-babel-2.12.patch
-
 BuildArch:     noarch
 
 BuildRequires: make
@@ -242,12 +238,6 @@ This package contains documentation in the HTML format.
 rm tests/test_ext_imgconverter.py
 %endif
 
-# Remove the tests that rely on setuptools
-# https://github.com/sphinx-doc/sphinx/commit/44326fe2476db44e8c2a60d9326c9c3ac2865c03
-rm -r tests/roots/test-setup/
-rm tests/roots/test-theming/{MANIFEST.in,setup.py}
-rm tests/test_setup_command.py
-
 %if %{defined rhel}
 # unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182
 sed -i '/html5lib/d' pyproject.toml
@@ -370,6 +360,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %changelog
+* Mon Jun 26 2023 Karolina Surma <ksurma@redhat.com> - 1:6.2.1-1
+- Update to 6.2.1
+- Fixes rhbz#2188968
+
 * Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 1:6.1.3-4
 - Rebuilt for Python 3.12
 

sources

@@ -1 +1 @@
-SHA512 (Sphinx-6.1.3.tar.gz) = 97970f9c25355a5d40dedc7386415b84634f753f1f384ea2bbcee127ffcb637deca088daac615dce21518a32270b70e7e268321c72a4997d64d5eae99edadfbe
+SHA512 (Sphinx-6.2.1.tar.gz) = 88daae1f9bacbf513c0db1e7d732104b00ac36803b82e253d14eda287b4d48cfa34d0ed90b13099748610f405dc8bdcc54c2d33002a27b970117baf93418a062