From 81f2564e9969361405587feb32eba6803d2e959f Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Thu, 3 Aug 2023 14:15:15 +0800 Subject: [PATCH] Fix build error for sphinx 7.0 (cherry picked from commit adbfb3137a034ee07a9944cd7712f65629e72046) --- Fix-build-error-for-sphinx-7.0.patch | 12 ++++++++++++ ansible.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 Fix-build-error-for-sphinx-7.0.patch diff --git a/Fix-build-error-for-sphinx-7.0.patch b/Fix-build-error-for-sphinx-7.0.patch new file mode 100644 index 0000000..6ad3963 --- /dev/null +++ b/Fix-build-error-for-sphinx-7.0.patch @@ -0,0 +1,12 @@ +diff -Nur a/docs/docsite/_themes/sphinx_rtd_theme/layout.html b/docs/docsite/_themes/sphinx_rtd_theme/layout.html +--- a/docs/docsite/_themes/sphinx_rtd_theme/layout.html 2021-10-11 23:18:55.616846800 +0800 ++++ b/docs/docsite/_themes/sphinx_rtd_theme/layout.html 2023-08-03 11:26:18.125607871 +0800 +@@ -70,7 +70,7 @@ + + + {# CSS #} +- ++ + + + {%- for css in css_files %} diff --git a/ansible.spec b/ansible.spec index 54ce985..b5999c4 100644 --- a/ansible.spec +++ b/ansible.spec @@ -2,7 +2,7 @@ Name: ansible Summary: SSH-based configuration management, deployment, and task execution system Version: 2.9.27 -Release: 2 +Release: 3 License: GPLv3+ Source0: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz @@ -17,6 +17,7 @@ Patch2: ansible-2.9.6-disable-test_build_requirement_from_path_no_version.patch Patch3: fix-python-3.9-compatibility.patch Patch4: ansible-2.9.23-sphinx4.patch Patch5: hostname-module-support-openEuler.patch +Patch6: Fix-build-error-for-sphinx-7.0.patch Provides: ansible-python3 = %{version}-%{release} Obsoletes: ansible-python3 < %{version}-%{release} @@ -215,6 +216,9 @@ make PYTHON=/usr/bin/python3 tests-py3 %{python3_sitelib}/ansible_test %changelog +* Thu Aug 3 2023 liyanan - 2.9.27-3 +- Fix build error for sphinx 7.0 + * Fri Apr 29 2022 wangkai - 2.9.27-2 - Hostname module support openEuler and remove python-nose -- Gitee