diff --git a/.gitignore b/.gitignore index ed6054b..24e15a9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /ansible-1.7.1.tar.gz /ansible-1.7.2.tar.gz /ansible-1.8.tar.gz +/ansible-1.8.1.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 9f49798..de3ad76 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,7 +1,18 @@ -Index: ansible-1.7.2/bin/ansible-playbook -=================================================================== ---- ansible-1.7.2.orig/bin/ansible-playbook -+++ ansible-1.7.2/bin/ansible-playbook +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 @@ ####################################################### @@ -13,13 +24,12 @@ Index: ansible-1.7.2/bin/ansible-playbook import sys import os -Index: ansible-1.7.2/bin/ansible-vault -=================================================================== ---- ansible-1.7.2.orig/bin/ansible-vault -+++ ansible-1.7.2/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. +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 @@ -28,17 +38,3 @@ Index: ansible-1.7.2/bin/ansible-vault import os import sys -Index: ansible-1.7.2/bin/ansible -=================================================================== ---- ansible-1.7.2.orig/bin/ansible -+++ ansible-1.7.2/bin/ansible -@@ -19,6 +19,9 @@ - - ######################################################## - -+__requires__ = ['ansible'] -+import pkg_resources -+ - import os - import sys - diff --git a/ansible.spec b/ansible.spec index bca1f9b..11c054d 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.8 +Version: 1.8.1 Release: 1%{?dist} Group: Development/Libraries @@ -99,6 +99,12 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/ansible* %changelog +* Thu Nov 27 2014 Kevin Fenzi 1.8.1-1 +- Update to 1.8.1 + +* Tue Nov 25 2014 Kevin Fenzi 1.8-2 +- Rebase el6 patch + * Tue Nov 25 2014 Kevin Fenzi 1.8-1 - Update to 1.8 diff --git a/sources b/sources index 3195a86..267bffd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bef9102c42f6c4820d1d262c4d1f606e ansible-1.8.tar.gz +e452a9cf5891a7c4f694684be2c531a5 ansible-1.8.1.tar.gz