diff --git a/Fix-double-colons-with-docutils-0.18.patch b/Fix-double-colons-with-docutils-0.18.patch new file mode 100644 index 0000000..d1902d9 --- /dev/null +++ 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; diff --git a/python-sphinx.spec b/python-sphinx.spec index 0d9b1dc..575a48a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -28,7 +28,7 @@ Name: python-sphinx #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?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,10 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib %changelog +* Wed Feb 01 2023 Karolina Surma - 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 - 1:5.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild