[ansible: 28/30] Merge branch 'el6' Conflicts: .gitignore ansible.spec

[Toshio くらとみ]

commit 2fa3d3b303ea8ac9ed0cc9ba2546d2aae9f528ca
Merge: 8dc5eaa 19c1aa7
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Apr 2 10:10:47 2014 -0700

    Merge branch 'el6'
    Conflicts:
    	.gitignore
    	ansible.spec

 .gitignore                                         |   26 ---------
 ...ols-to-get-a-recent-enough-version-of-pyt.patch |   56 ++++++++++++++++++++
 ansible.spec                                       |   31 ++++++++++-
 3 files changed, 85 insertions(+), 28 deletions(-)
---
diff --cc ansible.spec
index 3d115be,75b4777..534cbfb
--- a/ansible.spec
+++ b/ansible.spec
@@@ -10,7 -10,7 +10,7 @@@ BuildRoot: %{_tmppath}/%{name}-%{versio
  Name: ansible
  Summary: SSH-based configuration management, deployment, and task execution system
  Version: 1.5.3
--Release: 2%{?dist}
++Release: 3%{?dist}
  
  Group: Development/Libraries
  License: GPLv3
@@@ -82,21 -103,12 +103,27 @@@ rm -rf $RPM_BUILD_ROO
  %doc examples/playbooks
  
  %changelog
 -* Wed Apr  2 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5.3-2
++* Wed Apr  2 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5.3-3
+ - Add missing dependency on python-setuptools
+ 
 +* Fri Mar 14 2014 Kevin Fenzi <kevin at scrye.com> 1.5.3-2
 +- Update to NEW 1.5.3 upstream release.
 +
 +* Thu Mar 13 2014 Kevin Fenzi <kevin at scrye.com> 1.5.3-1
 +- Update to 1.5.3
 +
 +* Tue Mar 11 2014 Kevin Fenzi <kevin at scrye.com> 1.5.2-2
 +- Update to redone 1.5.2 release
 +
+ * Wed Mar 12 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 1.5.3-1
+ - Fix ansible-vault for newer python-crypto dependency
+ 
 +* Tue Mar 11 2014 Kevin Fenzi <kevin at scrye.com> 1.5.2-1
 +- Update to 1.5.2
 +
 +* Mon Mar 10 2014 Kevin Fenzi <kevin at scrye.com> 1.5.1-1
 +- Update to 1.5.1
 +
  * Fri Feb 28 2014 Kevin Fenzi <kevin at scrye.com> 1.5-1
  - Update to 1.5