Use the docs sources from ansible-documentation

This commit is contained in:
Maxwell G 2023-07-18 14:14:27 +00:00
parent 937593320f
commit b34a65757b
No known key found for this signature in database
GPG Key ID: F79E4E25E8C661F8
3 changed files with 9 additions and 5 deletions

1
.gitignore vendored
View File

@ -32,3 +32,4 @@
/ansible-core-2.15.0.tar.gz
/ansible-core-2.15.1.tar.gz
/ansible-core-2.15.2.tar.gz
/ansible-documentation-2.15.2.tar.gz

View File

@ -19,7 +19,8 @@ Release: 1%{?dist}
License: GPL-3.0-or-later AND BSD-2-Clause AND PSF-2.0 AND MIT AND Apache-2.0
Source0: https://github.com/ansible/ansible/archive/v%{uversion}/%{name}-%{uversion}.tar.gz
Source1: build_manpages.py
Source1: https://github.com/ansible/ansible-documentation/archive/v%{uversion}/ansible-documentation-%{uversion}.tar.gz
Source2: build_manpages.py
Patch: https://github.com/ansible/ansible/commit/734f38b2594692707d1fd3cbcfc8dc8a677f4ee3.patch#/GALAXY_COLLECTIONS_PATH_WARNINGS.patch
# urls - remove deprecated client key calls (#80751)
@ -125,7 +126,7 @@ This package installs extensive documentation for ansible-core
%prep
%autosetup -N -n ansible-%{uversion}
%autosetup -N -n ansible-%{uversion} -a1
%autopatch -M 4999 -p1
# Python 3.12 specific patches
# Set `-D '_has_python312 1'` to test locally
@ -163,7 +164,7 @@ echo 'python%{python3_pkgversion}-argcomplete'
# See https://github.com/ansible/ansible/issues/80368
# and the discussion in https://github.com/ansible/ansible/pull/80372
# for more details.
PYTHONPATH="$(pwd)/packaging" %{python3} %{S:1}
PYTHONPATH="$(pwd)/packaging" %{python3} %{S:2}
%if %{with argcomplete}
# Build shell completions
@ -283,15 +284,16 @@ install -Dpm 0644 licenses/* -t %{buildroot}%{_pkglicensedir}
%{_mandir}/man1/ansible*
%files doc
%doc docs/docsite/rst
%doc ansible-documentation-%{uversion}/docs/docsite/rst
%if %{with docs}
%doc docs/docsite/_build/html
%doc ansible-documentation-%{uversion}/docs/docsite/_build/html
%endif
%changelog
* Tue Jul 18 2023 Maxwell G <maxwell@gtmx.me> - 2.15.2-1
- Update to 2.15.2. Fixes rhbz#2223469.
- Use the docs sources from https://github.com/ansible/ansible-documentation.
* Mon Jul 03 2023 Maxwell G <maxwell@gtmx.me> - 2.15.1-2
- Rebuilt for Python 3.12

View File

@ -1 +1,2 @@
SHA512 (ansible-core-2.15.2.tar.gz) = 905b6c82f7fcc09f6b776bea9e48568a23d561bac1e3caefe996a5c0f4743cbc3f68913a0ddccf5aeec033f9471df2b06b55d86ed694efc1397730b54d884074
SHA512 (ansible-documentation-2.15.2.tar.gz) = aeb51bf4cae432da34c57dc2d838fa97aff71e4c09410e94e56b6905b9ddc88972d2c427a1f37f05dc39829f943aaeac9be52f856c5a2fb6d8860556183e157b