diff --git a/.gitignore b/.gitignore index db2c392..1df7dc0 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /ansible-2.8.3.tar.gz /ansible-2.8.4.tar.gz /ansible-2.8.5.tar.gz +/ansible-2.9.0.tar.gz diff --git a/ansible.spec b/ansible.spec index 00b41c3..807ec1c 100644 --- a/ansible.spec +++ b/ansible.spec @@ -1,3 +1,8 @@ +# +# NOTE: This spec is particular to the epel7 branch. +# Please modify it alone and do not merge master or +# any other branches into it. +# # RHEL 6 didn't have a __python2 macro. # Amazon Linux 2015.9 is based on RHEL6, with /usr/bin/python2 -> python2.6, while # /usr/bin/python -> python2.7. Explicitly use python2.6. @@ -29,7 +34,7 @@ Name: ansible Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.8.5 +Version: 2.9.0 Release: 1%{?dist} License: GPLv3+ @@ -41,11 +46,6 @@ Source0: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz # upstream as they don't know what their customers are running. Patch100: ansible-newer-jinja.patch -# Python 3.8 compatibility in docs -# https://bugzilla.redhat.com/show_bug.cgi?id=1712531 -# rebased from https://github.com/ansible/ansible/pull/56806 -Patch101: 56806.patch - Url: http://ansible.com BuildArch: noarch @@ -94,6 +94,7 @@ BuildRequires: python3-sphinx-theme-alabaster %if 0%{?rhel} == 7 BuildRequires: pytest BuildRequires: python2-sphinx-theme-alabaster +BuildRequires: python-straight-plugin %else BuildRequires: python-pytest BuildRequires: python-pytest-xdist @@ -267,8 +268,6 @@ This package installs extensive documentation for ansible %patch100 -p1 %endif -%patch101 -p1 - %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -300,8 +299,9 @@ popd %if ! %with_docs && ( 0%{?fedora} || 0%{?rhel} >= 7) # Generate the rst docs from the source if they weren't generated earlier as - # part of the html docs build - make -Cdocs/docsite config cli keywords modules plugins testing + # part of the html docs build. + # This is broken right now because it needs python3 and python3-straight-plugin + #make -Cdocs/docsite config cli keywords modules plugins testing %endif %install @@ -430,14 +430,14 @@ popd # python3 and 2 %config(noreplace) %{_sysconfdir}/ansible/ %{_datadir}/ansible/ -%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG-v2.8.rst +%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG-v2.9.rst %doc %{_mandir}/man1/ansible* %if 0%{?with_python3} %if 0%{?with_python2} %files -n ansible-python3 %config(noreplace) %{_sysconfdir}/ansible/ -%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG-v2.8.rst +%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG-v2.9.rst %doc %{_mandir}/man1/ansible* %{_bindir}/ansible*-3* %endif @@ -453,6 +453,9 @@ popd %endif %changelog +* Fri Nov 08 2019 Kevin Fenzi - 2.9.0-1 +- Update to 2.9.0. + * Fri Sep 13 2019 Kevin Fenzi - 2.8.5-1 - Update to 2.8.5. diff --git a/sources b/sources index 9528a50..88bb11d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ansible-2.8.5.tar.gz) = 6555b9a3d3d8298410e54f7116d92fc1978bef185a5136cfb809c1942b08b96c562af9e0d6d1a25eee5a4024d309b6713ce27836857b428a7c362e26efb53777 +SHA512 (ansible-2.9.0.tar.gz) = 47e0738bbf9918254d7b33ddc0a8f89a101995ccc3cb846be9ff10bdbc7687fb8a5390d8b976b3ce17fa1325ab63a592161b026d5d943a01f8a5803fca67312a