Fix rendering of double colons in Sphinx roles with docutils 0.18+

Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-02-01 10:54:49 +01:00 · 2022-07-22 22:27:44 +00:00 · 2022-06-30 10:49:45 +02:00 · 2022-06-13 21:14:17 +02:00 · 2022-06-13 18:04:49 +02:00 · 2022-04-20 11:25:50 +02:00
5 changed files with 60 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@
 /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
@@ -0,0 +1,27 @@
+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/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -6,7 +6,7 @@

 # Unset -s on python shebang to allow RPM-installed sphinx to be used
 # with user-installed modules (#1903763)
-%global py3_shebang_flags %nil
+%global py3_shebang_flags %(echo %py3_shebang_flags | sed s/s//)

 # No internet in Koji
 %bcond_with internet
@@ -24,11 +24,11 @@
 %global upstream_name Sphinx

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

@@ -45,6 +45,12 @@ Source0:    %{pypi_source %{upstream_name} %{upstream_version}}
 # 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
+
 BuildArch:     noarch

 BuildRequires: make
@@ -364,6 +370,26 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib


 %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
--- a/2
+++ b/2
@@ -1 +1 @@
-SHA512 (Sphinx-4.4.0.tar.gz) = f5780a7da7a5d758b0e145ab9a7f191a9c65fd3ca4624ca3a04f0d161e3cd6c7133df53ff56e42f012687cbce0460178c2e7957974b5b929b341c98db996c640
+SHA512 (Sphinx-5.0.2.tar.gz) = d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6
--- 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
Author	SHA1	Message	Date
Karolina Surma	a9da38dc47	Fix rendering of double colons in Sphinx roles with docutils 0.18+	2023-02-01 10:54:49 +01:00
Fedora Release Engineering	2fbf62bfba	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-22 22:27:44 +00:00
Karolina Surma	a0cc515b74	Update to 5.0.2	2022-06-30 10:49:45 +02:00
Python Maint	0b87836124	Rebuilt for Python 3.11	2022-06-13 21:14:17 +02:00
Python Maint	be9e7b1508	Bootstrap for Python 3.11	2022-06-13 18:04:49 +02:00
Karolina Surma	81f3c96c10	Update to 4.5.0	2022-04-20 11:25:50 +02:00
Miro Hrončok	055cf1292a	Prepare spec for multiple flags in %py3_shebang_flags See the relevant change of packaging guidelines: https://pagure.io/packaging-committee/pull-request/1165 tl;dr If we ever add more flags, we want to remove s here, not all flags.	2022-03-23 12:31:47 +01:00