diff --git a/.ansible.metadata b/.ansible.metadata index 1d1012b..1ca5e23 100644 --- a/.ansible.metadata +++ b/.ansible.metadata @@ -1 +1 @@ -7c5aa4e8908a0110904f3886000172cbb81c98a4 SOURCES/ansible-2.3.1.0.tar.gz +abea37a4ba664b55af3d0d9c6017d45daa9816cd SOURCES/ansible-2.3.2.0.tar.gz diff --git a/.gitignore b/.gitignore index afc63cc..485007a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ansible-2.3.1.0.tar.gz +SOURCES/ansible-2.3.2.0.tar.gz diff --git a/SOURCES/ansible-pr-23391.patch b/SOURCES/ansible-pr-23391.patch deleted file mode 100644 index ef2bd6b..0000000 --- a/SOURCES/ansible-pr-23391.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e4fae653daa2fc66f5aee63ab4b523f79809fb19 Mon Sep 17 00:00:00 2001 -From: Michael Scherer -Date: Fri, 21 Apr 2017 13:40:47 +0200 -Subject: [PATCH] Fix --force for unversionned requirements (#23391) - -In current stable (2.2), ansible galaxy install --force do erase -a role, even if the version is not set. This commit should restore -that specific behavior, in accordance to people reports: - https://github.com/ansible/ansible/issues/11266#issuecomment-273801480 - -It was also the behavior planned in the initial discussion: -"if you're not fixing versions in your roles file, then it's fine -to expect that the role will be reinstalled each time you run -ansible-galaxy install.", cf https://github.com/ansible/ansible/pull/12904 -(cherry picked from commit 78836ec0b9719a62fa0f8619707a9f411ed4a4f0) ---- - lib/ansible/cli/galaxy.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py -index 143fd80..da371e4 100644 ---- a/lib/ansible/cli/galaxy.py -+++ b/lib/ansible/cli/galaxy.py -@@ -379,8 +379,9 @@ class GalaxyCLI(CLI): - (role.name, role.install_info['version'], role.version or "unspecified")) - continue - else: -- display.display('- %s is already installed, skipping.' % str(role)) -- continue -+ if not force: -+ display.display('- %s is already installed, skipping.' % str(role)) -+ continue - - try: - installed = role.install() --- -2.9.4 - diff --git a/SPECS/ansible.spec b/SPECS/ansible.spec index 61a1853..9325a12 100644 --- a/SPECS/ansible.spec +++ b/SPECS/ansible.spec @@ -21,19 +21,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Name: ansible Summary: SSH-based configuration management, deployment, and task execution system -Version: 2.3.1.0 -Release: 3%{?dist} +Version: 2.3.2.0 +Release: 2%{?dist} Group: Development/Libraries License: GPLv3+ Source0: http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz -# Fixes a regression in 2.3.0 - see https://github.com/ansible/ansible/issues/25933 -Patch0: ansible-pr-23391.patch # Provides default search paths, among them /usr/share/ansible/roles, # which will be used in other packages -#Patch1: ansible-pr-23038.patch -Patch1: ansible-rolepath.patch +Patch0: ansible-rolepath.patch # Patch to utilize a newer jinja2 package on epel6 # Non-upstreamable as it creates a dependency on a specific version of jinja. @@ -109,6 +106,7 @@ Requires: python-paramiko # is deprecated, just ignore it #Requires: python-keyczar Requires: python-httplib2 +Requires: python-passlib Requires: python-setuptools Requires: python-six Requires: sshpass @@ -220,7 +218,6 @@ This package installs extensive documentation for ansible %prep %setup -q %patch0 -p1 -%patch1 -p1 %if 0%{?rhel} == 6 %patch100 -p1 @@ -339,6 +336,17 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Aug 24 2017 Pavel Cahyna - 2.3.2.0-2 +- Add a runtime dependency on python-passlib (bz #1484860). + +* Tue Aug 08 2017 Ryan Brown - 2.3.2.0-1 +- Rebase to Ansible 2.3.2 release +- Resolves bz #1478867 + +* Tue Aug 08 2017 Pavel Cahyna - 2.3.2.0-0.1.rc5 +- Update to the latest release candidate of 2.3.2.0 (rc5) +- Drop the patch for issue 25933 (bz #1463440), it is included upstream. + * Mon Jun 26 2017 Pavel Cahyna - 2.3.1.0-3 - Claim ownership of the /usr/share/ansible and /usr/share/ansible/roles dirs.