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 deleted file mode 100644 index de3ad76..0000000 --- a/0001-Use-setuptools-to-get-a-recent-enough-version-of-pyt.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Nur ansible-1.8.orig/bin/ansible ansible-1.8/bin/ansible ---- ansible-1.8.orig/bin/ansible 2014-11-25 15:43:06.000000000 -0700 -+++ ansible-1.8/bin/ansible 2014-11-25 17:07:30.183061715 -0700 -@@ -18,6 +18,8 @@ - # along with Ansible. If not, see . - - ######################################################## -+__requires__ = ['ansible'] -+import pkg_resources - - import os - import sys -diff -Nur ansible-1.8.orig/bin/ansible-playbook ansible-1.8/bin/ansible-playbook ---- ansible-1.8.orig/bin/ansible-playbook 2014-11-25 15:43:06.000000000 -0700 -+++ ansible-1.8/bin/ansible-playbook 2014-11-25 17:07:34.694979702 -0700 -@@ -18,8 +18,8 @@ - - ####################################################### - --#__requires__ = ['ansible'] --#import pkg_resources -+__requires__ = ['ansible'] -+import pkg_resources - - import sys - import os -diff -Nur ansible-1.8.orig/bin/ansible-vault ansible-1.8/bin/ansible-vault ---- ansible-1.8.orig/bin/ansible-vault 2014-11-25 15:43:06.000000000 -0700 -+++ ansible-1.8/bin/ansible-vault 2014-11-25 17:06:50.668779958 -0700 -@@ -18,8 +18,8 @@ - # ansible-vault is a script that encrypts/decrypts YAML files. See - # http://docs.ansible.com/playbooks_vault.html for more details. - --#__requires__ = ['ansible'] --#import pkg_resources -+__requires__ = ['ansible'] -+import pkg_resources - - import os - import sys diff --git a/ansible-use-simplejson.patch b/ansible-use-simplejson.patch deleted file mode 100644 index 1939008..0000000 --- a/ansible-use-simplejson.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: ansible-1.8.2/lib/ansible/runner/filter_plugins/core.py -=================================================================== ---- ansible-1.8.2.orig/lib/ansible/runner/filter_plugins/core.py -+++ ansible-1.8.2/lib/ansible/runner/filter_plugins/core.py -@@ -16,7 +16,12 @@ - # along with Ansible. If not, see . - - import base64 --import json -+try: -+ # simplejson is faster and can be more up-to-date (more bugfixes) than the -+ # stdlib json. In py2.7 stdlib json is based on simplejson 2.0.9 -+ import simplejson as json -+except ImportError: -+ import json - import os.path - import yaml - import types diff --git a/ansible.spec b/ansible.spec index 233cf4d..1b2c2b1 100644 --- a/ansible.spec +++ b/ansible.spec @@ -10,16 +10,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Name: ansible Summary: SSH-based configuration management, deployment, and task execution system Version: 1.9.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: GPLv3 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 -# Work around for a bug in python2.6's json library by preferring simplejson -Patch1: ansible-use-simplejson.patch Url: http://ansible.com BuildArch: noarch @@ -74,13 +69,6 @@ are transferred to managed machines automatically. %prep %setup -q -%if 0%{?rhel} == 6 -# Patch to make ansible-vault use a newer pycrypto forward-compat package -%patch0 -p1 -# Use simplejson to work around a bug in python2.6 -%patch1 -p1 -%endif - %build %{__python} setup.py build @@ -110,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/ansible* %changelog +* Wed Mar 25 2015 Kevin Fenzi 1.9.0.1-2 +- Drop upstreamed epel6 patches. + * Wed Mar 25 2015 Kevin Fenzi 1.9.0.1-1 - Update to 1.9.0.1