diff --git a/.gitignore b/.gitignore index 0bbed0a..a098dfc 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ /ansible-core-2.15.1.tar.gz /ansible-core-2.14.7.tar.gz /ansible-core-2.14.8.tar.gz +/ansible-core-2.14.9.tar.gz +/ansible-documentation-2.14.9.tar.gz diff --git a/ansible-core.spec b/ansible-core.spec index f3d6cf4..b865ebd 100644 --- a/ansible-core.spec +++ b/ansible-core.spec @@ -5,7 +5,7 @@ # Disable shebang munging for specific paths. These files are data files. # ansible-test munges the shebangs itself. -%global __brp_mangle_shebangs_exclude_from_file %{SOURCE1} +%global __brp_mangle_shebangs_exclude_from_file %{SOURCE2} # RHEL and Fedora add -s to the shebang line. We do *not* use -s -E -S or -I # with ansible because it has many optional features which users need to @@ -27,17 +27,18 @@ Name: ansible-core Summary: SSH-based configuration management, deployment, and task execution system Epoch: 1 -Version: 2.14.8 +Version: 2.14.9 Release: 1%{?dist} Group: Development/Libraries License: GPLv3+ Source0: https://files.pythonhosted.org/packages/source/a/ansible-core/ansible-core-%{version}.tar.gz -Source1: ansible-test-data-files.txt +Source1: https://github.com/ansible/ansible-documentation/archive/v%{version}/ansible-documentation-%{version}.tar.gz +Source2: ansible-test-data-files.txt # And bundled deps -Source2: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{jinja2_version}.tar.gz -Source3: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{markupsafe_version}.tar.gz +Source3: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{jinja2_version}.tar.gz +Source4: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{markupsafe_version}.tar.gz Patch0: remove-bundled-deps-from-requirements.patch @@ -62,6 +63,7 @@ Provides: bundled(python-jinja2) = %{jinja2_version} Provides: bundled(python-markupsafe) = %{markupsafe_version} BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-docutils BuildRequires: python%{python3_pkgversion}-pip BuildRequires: python%{python3_pkgversion}-pyyaml BuildRequires: python%{python3_pkgversion}-rpm-macros @@ -99,7 +101,7 @@ This package installs the ansible-test command for testing modules and plugins developed for ansible. %prep -%setup -q -b2 -b3 -n ansible-core-%{version} +%setup -q -b1 -b3 -b4 -n ansible-core-%{version} %patch0 -p1 # Fix all Python shebangs recursively in ansible-test @@ -153,13 +155,17 @@ done mkdir -p %{buildroot}%{_sysconfdir}/ansible/ mkdir -p %{buildroot}%{_sysconfdir}/ansible/roles/ -cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/ -cp examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/ +cp ../ansible-documentation-%{version}/examples/hosts %{buildroot}%{_sysconfdir}/ansible/ +cp ../ansible-documentation-%{version}/examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/ + mkdir -p %{buildroot}/%{_mandir}/man1/ +mkdir -p docs/man/man1 +PYTHONPATH=%{vendor_path} %{__python3} packaging/cli-doc/build.py man --output-dir docs/man/man1 + cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/ -cp -pr docs/docsite/rst . +cp -pr ../ansible-documentation-%{version}/docs/docsite/rst . cp -p lib/ansible_core.egg-info/PKG-INFO . strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} @@ -169,7 +175,7 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %{_bindir}/ansible* %exclude %{_bindir}/ansible-test %config(noreplace) %{_sysconfdir}/ansible/ -%doc README.rst PKG-INFO COPYING +%doc README.md PKG-INFO COPYING %doc changelogs/CHANGELOG-v2.*.rst %doc %{_mandir}/man1/ansible* %{_datadir}/ansible/ @@ -183,6 +189,11 @@ strip --strip-unneeded %{vendor_path}/markupsafe/_speedups%{python3_ext_suffix} %changelog +* Wed Aug 16 2023 Dimitri Savineau - 1:2.14.9-1 +- ansible-core 2.14.9 release (rhbz#2232432) +- Use docs and examples from ansible-documentation project. +- Build the manpages. + * Mon Aug 14 2023 Dimitri Savineau - 1:2.14.8-1 - ansible-core 2.14.8 release (rhbz#2231892) diff --git a/sources b/sources index c7a1a2e..458bd7b 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ -SHA512 (ansible-core-2.14.8.tar.gz) = 601c9f58db7382944bf3c597fe93c630d8aec0e77bccab992c2bfc612824185d49e0af01b1bca43ced78918d843cd9b53cb2ebd2a6e26c07747bd13ba276be2c +SHA512 (ansible-core-2.14.9.tar.gz) = ce5aaaf264472a60bf890f5b3c2d6494cb649371f2c78723cccd8bf7e0ec352ff939234a177e7e12d8ec637e7d62c37247feb1ef7e2395293d3bee7fd331649b +SHA512 (ansible-documentation-2.14.9.tar.gz) = 97346656f7988889cde81fccb65593807f0e1fe4b9f5d0d62d1ddedcfa5b19d1b89a5802c963dbc4798306a40f3fdb4f048d8789826b040d4e6e7f3a0669ac43 SHA512 (Jinja2-3.1.2.tar.gz) = 5dfe122c1beef5305b34d25f22f96607bd3a6cba098b03091850ea36fefe62b645a7218d7584b35bea252393ac922c9bb3654a9e90f23bcfb273e811fcf2f2c1 SHA512 (MarkupSafe-2.1.2.tar.gz) = 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b