From eda014167fcc7f4bd22c3815f356e9629c68f76a Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Mon, 4 Dec 2023 13:32:50 +0100 Subject: [PATCH] Update to 2.0.0 --- 1464.patch | 65 ------------------------------------ python-sphinx_rtd_theme.spec | 15 ++++----- sources | 2 +- 3 files changed, 7 insertions(+), 75 deletions(-) delete mode 100644 1464.patch diff --git a/1464.patch b/1464.patch deleted file mode 100644 index 7678a87..0000000 --- a/1464.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6507e2be2a24c01a817bdac3ae020b3dd06d1652 Mon Sep 17 00:00:00 2001 -From: Benjamin Bach -Date: Sun, 30 Apr 2023 09:56:14 +0200 -Subject: [PATCH 1/2] Allow Sphinx 7 - ---- - setup.cfg | 2 +- - tox.ini | 6 ++++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 4c07f193f..da43b4b1c 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -45,7 +45,7 @@ zip_safe = False - packages = sphinx_rtd_theme - python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.* - install_requires = -- sphinx >=1.6,<7 -+ sphinx >=1.6,<8 - docutils <0.19 - sphinxcontrib-jquery >=4,<5 - tests_require = -diff --git a/tox.ini b/tox.ini -index 5f9fa7ca6..ea74e40ed 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -6,9 +6,9 @@ envlist = - # Python 3.10 working from Sphinx 4.2 and up - py{310}-sphinx{42,43,44,45,50,51,52,53,latest}{-html4,-html5}{-qa,} - # Sphinx 6+ has simplified docutils and Python support -- py{38,39,10}-sphinx{60}{-html5,}{-qa,} -+ py{38,39,10}-sphinx{60,61,70}{-html5,}{-qa,} - # Python 3.11 working from Sphinx 5.3 and up -- py{311}-sphinx{53,60,latest}{html5}{-qa,} -+ py{311}-sphinx{53,60,61,70,latest}{html5}{-qa,} - - [testenv] - setenv = -@@ -41,6 +41,8 @@ deps = - sphinx52: Sphinx>=5.2,<5.3 - sphinx53: Sphinx>=5.3,<5.4 - sphinx60: Sphinx>=6.0,<6.1 -+ sphinx61: Sphinx>=6.1,<6.2 -+ sphinx70: Sphinx>=7.0,<7.1 - # All these Sphinx versions actually break since docutils 0.18, so we need to add this upper bound - # Projects using these Sphinx versions will have to do the same - # See: https://github.com/readthedocs/sphinx_rtd_theme/pull/1304 - -From cf6b828b91b2c670824f38308afc53d6d2ca91a5 Mon Sep 17 00:00:00 2001 -From: Benjamin Bach -Date: Thu, 25 May 2023 18:46:51 +0200 -Subject: [PATCH 2/2] Also build theme docs with Sphinx 7 - ---- - docs/requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/requirements.txt b/docs/requirements.txt -index b28f68ee9..ef6d9c01e 100644 ---- a/docs/requirements.txt -+++ b/docs/requirements.txt -@@ -1 +1 @@ --sphinx>=6.1,<6.2 -+sphinx>=7.0,<7.1 diff --git a/python-sphinx_rtd_theme.spec b/python-sphinx_rtd_theme.spec index bcd026a..8f757d1 100644 --- a/python-sphinx_rtd_theme.spec +++ b/python-sphinx_rtd_theme.spec @@ -4,8 +4,8 @@ %bcond_with bootstrap Name: python-%{srcname} -Version: 1.2.2 -Release: 2%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Sphinx theme for readthedocs.org # SPDX @@ -18,8 +18,6 @@ Source: https://docs.readthedocs.io/en/latest/objects.inv # Remove all traces of html5shiv. We have no interest in supporting ancient # versions of Internet Explorer. Patch: %{name}-html5shiv.patch -# Backport changes to support Sphinx 7 -Patch: https://github.com/readthedocs/sphinx_rtd_theme/pull/1464.patch BuildArch: noarch @@ -67,11 +65,6 @@ readthedocs.org. %prep %autosetup -p1 -n %{srcname}-%{version} -# Make theme work with docutils 0.20+ in Fedora 39+ -# This is not officially supported yet, tracked upstram in: -# https://github.com/readthedocs/sphinx_rtd_theme/issues/1323 -sed -i "s|docutils <0.19|docutils <0.21|" setup.cfg - # Use local objects.inv for intersphinx sed -e "s|\('https://docs\.readthedocs\.io/en/stable/', \)None|\1'%{SOURCE1}'|" \ -e "s|\('https://www\.sphinx-doc\.org/en/master/', \)None|\1'%{_docdir}/python-sphinx-doc/html/objects.inv'|" \ @@ -194,6 +187,10 @@ grep 'format("woff2\?")' \ %endif %changelog +* Mon Dec 04 2023 Karolina Surma - 2.0.0-1 +- Update to 2.0.0 +Fixes rhbz#2233302 + * Mon Oct 16 2023 Miro HronĨok - 1.2.2-2 - Do not BuildRequire python3-sphinxcontrib-httpdomain, it was not needed diff --git a/sources b/sources index 77f2405..ffce2b8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (sphinx_rtd_theme-1.2.2.tar.gz) = 4c834ced078093ee0a10f69c135cebabfb92a921704eecf097b8be665a75c3d8a3d52e5d7eb40a1822e6a6640dcf4497066a1bb2327701a1b051d3777a1c29f5 +SHA512 (sphinx_rtd_theme-2.0.0.tar.gz) = 68dcf85250fe16248d47fe28b5a601ae1305051291b6b15f40366cea6e66ab5e0e49a4a0ea996d0ba0c339aeb14f947cf5d99e3160b3ba2a70882b209678b100 SHA512 (objects.inv) = a4109c3c70e2329ae38cf2a276b3cab0f406e70b6fbe210b1617ade85c03fa5ad37e89d58ae928a355ba0f2bafe22c17e361819600c8d8e5235672ef355bf966