[ansible] Update to 1.6

[Toshio くらとみ]

commit 03e3edf6ff1eb8d16d02f2eb175e67d3a0fa27b6
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon May 5 19:45:44 2014 -0700

    Update to 1.6
    
    - Drop accelerate fix, merged upstream
    - Refresh RHEL6 pycrypto patch.  It was half-merged upstream.

 .gitignore                                         |    1 +
 ...ols-to-get-a-recent-enough-version-of-pyt.patch |   62 ++++++--------------
 ansible.spec                                       |   20 +++----
 sources                                            |    2 +-
 4 files changed, 28 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 639f3d5..06df6cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /ansible-1.5.3.tar.gz
 /ansible-1.5.4.tar.gz
 /ansible-1.5.5.tar.gz
+/ansible-1.6.tar.gz
diff --git a/0001-Use-setuptools-to-get-a-recent-enough-version-of-pyt.patch b/0001-Use-setuptools-to-get-a-recent-enough-version-of-pyt.patch
index 9a658d3..43fcde7 100644
--- a/0001-Use-setuptools-to-get-a-recent-enough-version-of-pyt.patch
+++ b/0001-Use-setuptools-to-get-a-recent-enough-version-of-pyt.patch
@@ -1,56 +1,30 @@
-From 02519a2a77e7d88c32fb3f3b4db7c6cb20da7006 Mon Sep 17 00:00:00 2001
-From: Toshio Kuratomi <toshio at fedoraproject.org>
-Date: Fri, 14 Mar 2014 13:16:04 -0700
-Subject: [PATCH] Use setuptools to get a recent enough version of
- python-crypto2.6
-
----
- bin/ansible-playbook | 3 +++
- bin/ansible-vault    | 3 +++
- setup.py             | 2 +-
- 3 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/bin/ansible-playbook b/bin/ansible-playbook
-index 5aa020a..a8ada00 100755
---- a/bin/ansible-playbook
-+++ b/bin/ansible-playbook
-@@ -18,6 +18,9 @@
+Index: ansible-1.6/bin/ansible-playbook
+===================================================================
+--- ansible-1.6.orig/bin/ansible-playbook
++++ ansible-1.6/bin/ansible-playbook
+@@ -18,8 +18,8 @@
  
  #######################################################
  
-+__requires__ = ['pycrypto >= 2.6']
+-#__requires__ = ['ansible']
+-#import pkg_resources
++__requires__ = ['ansible']
 +import pkg_resources
-+
+ 
  import sys
  import os
- import stat
-diff --git a/bin/ansible-vault b/bin/ansible-vault
-index 2c8094d..b0a9926 100755
---- a/bin/ansible-vault
-+++ b/bin/ansible-vault
-@@ -20,6 +20,9 @@
+Index: ansible-1.6/bin/ansible-vault
+===================================================================
+--- ansible-1.6.orig/bin/ansible-vault
++++ ansible-1.6/bin/ansible-vault
+@@ -20,8 +20,8 @@
  # example playbook to bootstrap this script in the examples/ dir which
  # installs ansible and sets it up to run on cron.
  
-+__requires__ = ['pycrypto >= 2.6']
+-#__requires__ = ['ansible']
+-#import pkg_resources
++__requires__ = ['ansible']
 +import pkg_resources
-+
+ 
  import os
  import sys
- import traceback
-diff --git a/setup.py b/setup.py
-index c537ee9..34425e1 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,7 @@ setup(name='ansible',
-       author_email='michael at ansible.com',
-       url='http://ansible.com/',
-       license='GPLv3',
--      install_requires=['paramiko', 'jinja2', "PyYAML"],
-+      install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6'],
-       package_dir={ 'ansible': 'lib/ansible' },
-       packages=[
-          'ansible',
--- 
-1.8.5.3
-
diff --git a/ansible.spec b/ansible.spec
index ef31b7b..a2d7e83 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 1.5.5
+Version: 1.6
 Release: 1%{?dist}
 
 Group: Development/Libraries
@@ -18,10 +18,6 @@ Source0: http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
 # Patch to make ansible-vault use the forward-compat python-crypto2.6 package
 # Upstreamed here: https://github.com/ansible/ansible/pull/6498
 Patch0: 0001-Use-setuptools-to-get-a-recent-enough-version-of-pyt.patch
-# Patch to fix accelerate with rawhide
-# https://github.com/ansible/ansible/commit/0556c53f7878c9ac2a59100c2752785482e806aa.patch
-# https://github.com/ansible/ansible/issues/6447
-Patch1: 0556c53f7878c9ac2a59100c2752785482e806aa.patch
 Url: http://ansible.com
 
 BuildArch: noarch
@@ -35,12 +31,14 @@ Requires: python26-keyczar
 Requires: python26-httplib2
 %else
 BuildRequires: python2-devel
+BuildRequires: python-setuptools
 
 Requires: PyYAML
 Requires: python-paramiko
 Requires: python-jinja2
 Requires: python-keyczar
 Requires: python-httplib2
+Requires: python-setuptools
 %endif
 
 %if 0%{?rhel} == 6
@@ -50,11 +48,6 @@ Requires: python-httplib2
 # make use of this forward compat package (see the patch for ansible-vault
 # above to see what needs to be done.)
 Requires: python-crypto2.6
-
-# This may become a Requires on all versions with the next upstream release as
-# the patch is looking like it will be accepted upstream.
-# https://github.com/ansible/ansible/pull/6497
-Requires: python-setuptools
 %endif
 
 # 
@@ -80,8 +73,6 @@ are transferred to managed machines automatically.
 # Patch to make ansible-vault use a newer pycrypto forward-compat package
 %patch0 -p1
 %endif
-# Patch to fix accelerator mode
-%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -110,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples/playbooks
 
 %changelog
+* Mon May  5 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6-1
+- Update to 1.6
+- Drop accelerate fix, merged upstream
+- Refresh RHEL6 pycrypto patch.  It was half-merged upstream.
+
 * Fri Apr 18 2014 Kevin Fenzi <kevin at scrye.com> 1.5.5-1
 - Update to 1.5.5
 
diff --git a/sources b/sources
index 4c79c33..c127c1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de27b5fc95104dd3295f4c90de39f3f0  ansible-1.5.5.tar.gz
+82fbb494ec6faddff430a6733c3e747c  ansible-1.6.tar.gz