From 300eb3a843dc773722ebd7bc1ceea9a3b8d91e86 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Tue, 2 Jun 2015 11:43:35 -0700
Subject: [PATCH] Add six as a dependency for packaging

---
 packaging/debian/README.md | 2 +-
 packaging/debian/control   | 2 +-
 packaging/rpm/ansible.spec | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packaging/debian/README.md b/packaging/debian/README.md
index 62c6af084c..a8150ff30f 100644
--- a/packaging/debian/README.md
+++ b/packaging/debian/README.md
@@ -3,7 +3,7 @@ Ansible Debian Package
 
 To create an Ansible DEB package:
 
-    sudo apt-get install python-paramiko python-yaml python-jinja2 python-httplib2 python-setuptools sshpass
+    sudo apt-get install python-paramiko python-yaml python-jinja2 python-httplib2 python-setuptools python-six sshpass
     sudo apt-get install cdbs debhelper dpkg-dev git-core reprepro python-support fakeroot asciidoc devscripts
     git clone git://github.com/ansible/ansible.git
     cd ansible
diff --git a/packaging/debian/control b/packaging/debian/control
index 14d737444e..73e1cc9202 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -8,7 +8,7 @@ Homepage: http://ansible.github.com/
 
 Package: ansible
 Architecture: all
-Depends: python, python-support (>= 0.90), python-jinja2, python-yaml, python-paramiko, python-httplib2, python-crypto (>= 2.6), sshpass, ${misc:Depends}
+Depends: python, python-support (>= 0.90), python-jinja2, python-yaml, python-paramiko, python-httplib2, python-six, python-crypto (>= 2.6), sshpass, ${misc:Depends}
 Description: A radically simple IT automation platform
  A radically simple IT automation platform that makes your applications and
  systems easier to deploy. Avoid writing scripts or custom code to deploy and
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 394017dc0f..ddda6eeb79 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -28,6 +28,7 @@ Requires: python26-jinja2
 Requires: python26-keyczar
 Requires: python26-httplib2
 Requires: python26-setuptools
+Requires: python26-six
 %endif
 
 # RHEL == 6
@@ -45,6 +46,7 @@ Requires: python-jinja2
 Requires: python-keyczar
 Requires: python-httplib2
 Requires: python-setuptools
+Requires: python-six
 %endif
 
 # FEDORA > 17
@@ -57,6 +59,7 @@ Requires: python-jinja2
 Requires: python-keyczar
 Requires: python-httplib2
 Requires: python-setuptools
+Requires: python-six
 %endif
 
 # SuSE/openSuSE
@@ -69,6 +72,7 @@ Requires: python-keyczar
 Requires: python-yaml
 Requires: python-httplib2
 Requires: python-setuptools
+Requires: python-six
 %endif
 
 Requires: sshpass