Remove version on Conflicts to allow:

- Fedora: dnf install --allowerasing ansible1.9
- RHEL/Centos: yum swap ansible ansible1.9
- Fixes bug #1330979

.gitignore

@@ -1 +1,2 @@
 /ansible-1.9.4.tar.gz
+/ansible-1.9.6.tar.gz

ansible1.9.spec

@@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Name: ansible1.9
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 1.9.4
+Version: 1.9.6
 Release: 2%{?dist}
 
 Group: Development/Libraries
@@ -32,9 +32,6 @@ Url: http://ansible.com
 Patch0: ansible-1.9.3-dnf.patch
 # Backport of the master branch dnf module. 
 Patch2: ansible-dnf-backport.patch
-# Backport fix for #2043, crash when pulling Docker images:
-# https://github.com/ansible/ansible-modules-core/commit/64b8596250e58a55eee8f2d4323d35ca32a8cd53
-Patch3: 0001-fix-2043-strip-empty-dict-from-end-of-pull-stream.patch
 BuildArch: noarch
 
 %if 0%{?rhel} && 0%{?rhel} <= 5
@@ -89,7 +86,7 @@ Provides: ansible-fireball = %{version}-%{release}
 Obsoletes: ansible-fireball < 1.2.4
 
 Provides: ansible = %{version}-%{release}
-Conflicts: ansible >= 2
+Conflicts: ansible
 
 %description
 
@@ -108,7 +105,6 @@ as an interim measure.
 
 %patch0 -p1
 %patch2 -p1
-%patch3 -p1
 
 %if 0%{?rhel} == 6
 %patch100 -p1
@@ -143,6 +139,15 @@ rm -rf $RPM_BUILD_ROOT
 %license COPYING
 
 %changelog
+* Wed Apr 27 2016 Kevin Fenzi <kevin@scrye.com> - 1.9.6-2
+- Remove version on Conflicts to allow:
+- Fedora: dnf install --allowerasing ansible1.9
+- RHEL/Centos: yum swap ansible ansible1.9
+- Fixes bug #1330979
+
+* Fri Apr 15 2016 Kevin Fenzi <kevin@scrye.com> - 1.9.6-1
+- Update to 1.9.6. Fixes bug #1327744
+
 * Sat Feb 13 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.9.4-2
 - Add three patches that were in the Fedora ansible package when it was based
   on 1.9.4 (fixes for dnf and docker)

sources

@@ -1 +1 @@
-ad411285d4a78e78e3a49f4ee2c7cc3f  ansible-1.9.4.tar.gz
+eabb2f5b510943d619e61b90d8c50a1d  ansible-1.9.6.tar.gz