diff --git a/.ansible-core.metadata b/.ansible-core.metadata index d0efb42..f2bb3bf 100644 --- a/.ansible-core.metadata +++ b/.ansible-core.metadata @@ -1,4 +1,4 @@ -1354c0bfb36de1b66298e786204a1268dedb3e38 SOURCES/ansible-4cafc937f065468ab9504ac985701c7f9ba24ed0.tar.gz +bb062c36de9d7854a823c44b67b9dca0f05a469d SOURCES/ansible-cb779ee9bb0909dc87dc339da102f98936c1c178.tar.gz d5b06047a8a5937c9433c8e0e88bcf2ccb6a4f84 SOURCES/packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz f20e820c8fa08ff162ace90735a2a89c599f7166 SOURCES/pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz c17fd6000af4ccf32930c41e928fea1e38cb5d0a SOURCES/straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed.tar.gz diff --git a/.gitignore b/.gitignore index f72f083..83618da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -SOURCES/ansible-4cafc937f065468ab9504ac985701c7f9ba24ed0.tar.gz +SOURCES/ansible-cb779ee9bb0909dc87dc339da102f98936c1c178.tar.gz SOURCES/packaging-ded06cedf6e20680eea0363fac894cb4a09e7831.tar.gz SOURCES/pyparsing-6a844ee35ca5125490a28dbd6dd2d15b6498e605.tar.gz SOURCES/straightplugin-6634ea8e1e89d5bb23804f50e676f196c52c46ed.tar.gz diff --git a/SOURCES/ansible-test-data-files.txt b/SOURCES/ansible-test-data-files.txt index 9a7f880..3f785f2 100644 --- a/SOURCES/ansible-test-data-files.txt +++ b/SOURCES/ansible-test-data-files.txt @@ -1 +1,2 @@ /usr/lib/python[0-9]+\.[0-9]+/site-packages/ansible_test/_data/.* +/usr/lib/python[0-9]+\.[0-9]+/site-packages/ansible_test/_util/.* diff --git a/SPECS/ansible-core.spec b/SPECS/ansible-core.spec index e6ad95d..2278821 100644 --- a/SPECS/ansible-core.spec +++ b/SPECS/ansible-core.spec @@ -15,7 +15,7 @@ # ansible-test munges the shebangs itself. %global __brp_mangle_shebangs_exclude_from_file %{SOURCE1} -%global commitId 4cafc937f065468ab9504ac985701c7f9ba24ed0 +%global commitId cb779ee9bb0909dc87dc339da102f98936c1c178 %global python39_sitelib /usr/lib/python3.9/site-packages/ # RHEL and Fedora add -s to the shebang line. We do *not* use -s -E -S or -I @@ -33,15 +33,16 @@ # These control which bundled dep versions we pin against %global packaging_version 20.4 %global pyparsing_version 2.4.7 +%global straightplugin_version 1.4.1 Name: ansible-core Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.11.3 +Version: 2.12.0 %if 0%{?nightly} Release: 0.1.%{snap}%{?dist} %else -Release: 4%{?dist} +Release: 1%{?dist} %endif Group: Development/Libraries @@ -49,7 +50,7 @@ License: GPLv3+ %if 0%{?nightly} Source0: %{name}-%{version}%{nightly_pretag}.tar.gz %else -Source0: ansible-4cafc937f065468ab9504ac985701c7f9ba24ed0.tar.gz +Source0: ansible-%{commitId}.tar.gz %endif Source1: ansible-test-data-files.txt @@ -68,7 +69,7 @@ Obsoletes: ansible-base # ... and provide 'ansible' so that old packages still work without updated # spec files. -#Provides: ansible +# Provides: ansible # Bundled provides that are sprinkled throughout the codebase. Provides: bundled(python-backports-ssl_match_hostname) = 3.7.0.1 @@ -79,6 +80,7 @@ Provides: bundled(python-six) = 1.13.0 # Things we explicitly bundle via src rpm, and put in ansible._vendor Provides: bundled(python-packaging) = %{packaging_version} Provides: bundled(python-pyparsing) = %{pyparsing_version} +Provides: bundled(python-straightplugin) = %{straightplugin_version} BuildRequires: python3-devel BuildRequires: python3-docutils @@ -89,7 +91,7 @@ BuildRequires: python3-resolvelib BuildRequires: python3-rpm-macros BuildRequires: python3-setuptools BuildRequires: python3-wheel -BuildRequires: make +BuildRequires: make git-core Requires: git Requires: python3 @@ -209,6 +211,22 @@ cp -p lib/ansible_core.egg-info/PKG-INFO . %{python39_sitelib}/ansible_test %changelog +* Mon Nov 08 2021 Dimitri Savineau - 2.12.0-1 +- ansible-core 2.12.0-1 + +* Tue Oct 12 2021 Christian Adams - 2.11.6-1 +- ansible-core 2.11.6-1, fix CVE-2021-3620, ansible-connection module + no long discloses sensitive info. + +* Wed Oct 06 2021 Yanis Guenane - 2.11.5-3 +- ansible-core 2.11.5-3, add virtual provide for straightplugin + +* Wed Sep 15 2021 Josh Boyer - 2.11.5-2 +- ansible-core 2.11.5-2 + +* Mon Sep 13 2021 Josh Boyer - 2.11.3-3 +- Bump for build + * Wed Jul 21 2021 Paul Belanger - 2.11.3-2 - Add git dependency for ansible-galaxy CLI command.