diff --git a/.gitignore b/.gitignore index 3cf89cb..586071b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ansible-core-2.11.0b4.tar.gz +/ansible-core-2.11.0.tar.gz diff --git a/ansible-core.spec b/ansible-core.spec index 7be3ab4..fd501e9 100644 --- a/ansible-core.spec +++ b/ansible-core.spec @@ -9,16 +9,16 @@ # %bcond_with tests -# Set this when there's a beta version -%global betaver b4 +# Set this when there's a beta or rc version +#%%global betaver rc2 Name: ansible-core Summary: A radically simple IT automation system Version: 2.11.0 -Release: 0.1.%{betaver}%{?dist} +Release: 1%{?betaver}%{?dist} License: GPLv3+ -Source0: %pypi_source ansible-core 2.11.0b4 +Source0: %pypi_source ansible-core %{version}%{?betaver} Source1: ansible.attr Source2: ansible-generator @@ -88,7 +88,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-six BuildRequires: python3-nose -BuildRequires: %{py3_dist pytest} +BuildRequires: python3-pytest BuildRequires: python3-pytest-xdist BuildRequires: python3-pytest-mock BuildRequires: python3-requests @@ -104,6 +104,8 @@ Recommends: python3-winrm # needed for json_query filter Requires: python3-jmespath +# needed for galaxy +Requires: python3-resolvelib %description Ansible is a radically simple model-driven configuration management, @@ -114,10 +116,12 @@ are transferred to managed machines automatically. This is the base part of ansible (the engine). -%package -n ansible-base-doc +%package -n ansible-core-doc Summary: Documentation for Ansible Base +Provides: ansible-base-doc = 2.10.7 +Obsoletes: ansible-base-doc < 2.10.6-1%{?dist} -%description -n ansible-base-doc +%description -n ansible-core-doc Ansible is a radically simple model-driven configuration management, multi-node deployment, and remote task execution system. Ansible works @@ -125,10 +129,10 @@ over SSH and does not require any software or daemons to be installed on remote nodes. Extension modules can be written in any language and are transferred to managed machines automatically. -This package installs extensive documentation for ansible-base +This package installs extensive documentation for ansible-core %prep -%autosetup -p1 -n %{name}-%{version}%{betaver} +%autosetup -p1 -n %{name}-%{version}%{?betaver} cp -a %{S:1} %{S:2} %{S:3} . %build @@ -233,13 +237,19 @@ make PYTHON=/usr/bin/python3 tests-py3 %{_rpmmacrodir}/macros.ansible %{_rpmconfigdir}/ansible-generator -%files -n ansible-base-doc +%files -n ansible-core-doc %doc docs/docsite/rst %if %{with docs} %doc docs/docsite/_build/html %endif %changelog +* Tue Apr 27 2021 Kevin Fenzi - 2.11.0-1 +- Update to 2.11.0 final. + +* Sat Apr 24 2021 Kevin Fenzi - 2.11.0-0.3.rc2 +- Update to 2.11.0rc2. + * Sat Apr 03 2021 Kevin Fenzi - 2.11.0-0.1.b4 - Rename to ansible-base, update to b4 beta version. diff --git a/sources b/sources index d3301f1..3832bb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ansible-core-2.11.0b4.tar.gz) = ae65819513b4ced654490d77d2e94a3de6ca59b759a64d8a3bfcad94f7395fb9f23d51058bd8921839a5a19daf2289b5df8d0e0aef7e9f305f7403b5f5368ddb +SHA512 (ansible-core-2.11.0.tar.gz) = 292be62bd4b0314d61eb7471f60f450be216c729a034f44f967ef827486b56ef1850de26928508f214ab430ea1584fc174cc4e8833f68d6e4de845e8565fd46a