From c393f96d42294bdc7b81d5ca487909c8dd263dc7 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sep 04 2015 02:49:48 +0000
Subject: Update to 1.9.3


- Patch dnf as package manager. Fixes bug #1258080
- Fixes bug #1251392 (in 1.9.3 release)
- Add requires for sshpass package. Fixes bug #1258799

---

diff --git a/.gitignore b/.gitignore
index 85a3722..7cba690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /ansible-1.9.0.1.tar.gz
 /ansible-1.9.1.tar.gz
 /ansible-1.9.2.tar.gz
+/ansible-1.9.3.tar.gz
diff --git a/ansible-1.9.3-dnf.patch b/ansible-1.9.3-dnf.patch
new file mode 100644
index 0000000..632df32
--- /dev/null
+++ b/ansible-1.9.3-dnf.patch
@@ -0,0 +1,11 @@
+diff -Nur ansible-1.9.3.orig/lib/ansible/module_utils/facts.py ansible-1.9.3/lib/ansible/module_utils/facts.py
+--- ansible-1.9.3.orig/lib/ansible/module_utils/facts.py	2015-09-03 17:03:08.000000000 -0600
++++ ansible-1.9.3/lib/ansible/module_utils/facts.py	2015-09-03 20:19:33.256457164 -0600
+@@ -115,6 +115,7 @@
+     # package manager, put the preferred one last.  If there is an
+     # ansible module, use that as the value for the 'name' key.
+     PKG_MGRS = [ { 'path' : '/usr/bin/yum',         'name' : 'yum' },
++                 { 'path' : '/usr/bin/dnf',         'name' : 'dnf' },
+                  { 'path' : '/usr/bin/apt-get',     'name' : 'apt' },
+                  { 'path' : '/usr/bin/zypper',      'name' : 'zypper' },
+                  { 'path' : '/usr/sbin/urpmi',      'name' : 'urpmi' },
diff --git a/ansible.spec b/ansible.spec
index 3ad45d3..69928a1 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -9,13 +9,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 1.9.2
+Version: 1.9.3
 Release: 1%{?dist}
 
 Group: Development/Libraries
 License: GPLv3
 Source0: http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
 Url: http://ansible.com
+#
+# Patch to detect dnf as package manager. 
+# already upstream with https://github.com/opoplawski/ansible/commit/f624ec4cb8771736ffbe3fe81b2949edda159863
+# https://bugzilla.redhat.com/show_bug.cgi?id=1258080
+Patch0: ansible-1.9.3-dnf.patch
 
 BuildArch: noarch
 %if 0%{?rhel} && 0%{?rhel} <= 5
@@ -36,6 +41,7 @@ Requires: python-jinja2
 Requires: python-keyczar
 Requires: python-httplib2
 Requires: python-setuptools
+Requires: sshpass
 %endif
 
 %if 0%{?rhel} == 6
@@ -69,6 +75,8 @@ are transferred to managed machines automatically.
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 %{__python} setup.py build
 
@@ -98,6 +106,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/ansible*
 
 %changelog
+* Thu Sep 03 2015 Kevin Fenzi <kevin@scrye.com> 1.9.3-1
+- Update to 1.9.3
+- Patch dnf as package manager. Fixes bug #1258080
+- Fixes bug #1251392 (in 1.9.3 release)
+- Add requires for sshpass package. Fixes bug #1258799
+
 * Thu Jun 25 2015 Kevin Fenzi <kevin@scrye.com> 1.9.2-1
 - Update to 1.9.2
 
diff --git a/sources b/sources
index 1f5a4cf..bc3af3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e0a72c8b7a3848907ac28b5f38cfc27  ansible-1.9.2.tar.gz
+55be10fca4e9e0172a15e88874028eff  ansible-1.9.3.tar.gz