Fix FTBFS with sphinx 4.x. Fixes rhbz#1977303

This commit is contained in:
Kevin Fenzi 2021-07-10 13:00:28 -07:00
commit f2669e1290
2 changed files with 19 additions and 1 deletions

View file

@ -0,0 +1,12 @@
diff --color -Nur ansible-2.9.23.orig/docs/docsite/_extensions/pygments_lexer.py ansible-2.9.23/docs/docsite/_extensions/pygments_lexer.py
--- ansible-2.9.23.orig/docs/docsite/_extensions/pygments_lexer.py 2021-06-21 23:04:48.000000000 -0700
+++ ansible-2.9.23/docs/docsite/_extensions/pygments_lexer.py 2021-07-10 12:33:05.790899630 -0700
@@ -178,7 +178,7 @@
See http://www.sphinx-doc.org/en/stable/extdev/index.html#dev-extensions.
"""
for lexer in [
- AnsibleOutputLexer(startinline=True)
+ AnsibleOutputLexer
]:
app.add_lexer(lexer.name, lexer)
for alias in lexer.aliases:

View file

@ -16,7 +16,7 @@
Name: ansible
Summary: SSH-based configuration management, deployment, and task execution system
Version: 2.9.23
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv3+
Source0: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
@ -35,6 +35,9 @@ Patch2: ansible-2.9.6-disable-test_build_requirement_from_path_no_version.patch
# Backported from upstream: https://github.com/ansible/ansible/pull/67891
Patch3: fix-python-3.9-compatibility.patch
# Fix to build docs with sphinx > 4.0
Patch4: ansible-2.9.23-sphinx4.patch
# We used to have a ansible-python3 package that a number of other things
# started depending on, so we should now provide/obsolete it until they
# can all adjust to just needing ansible.
@ -272,6 +275,9 @@ make PYTHON=/usr/bin/python3 tests-py3
%{python3_sitelib}/ansible_test
%changelog
* Sat Jul 10 2021 Kevin Fenzi <kevin@scrye.com> - 2.9.23-2
- Fix FTBFS with sphinx 4.x. Fixes rhbz#1977303
* Tue Jun 22 2021 Kevin Fenzi <kevin@scrye.com> - 2.9.23-1
- Update to 2.9.23. Fixes rhbz#1974592
- Add patch for Rocky Linux. Fixes rhbz#1968728