From c9b6b49c75df0bbefc4df7f671465a67166fa487 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sep 26 2017 22:56:06 +0000
Subject: Rebase rhel6 jinja2 patch.

Conditionalize jmespath to work around amazon linux issues. Fixes bug #1494640

---

diff --git a/ansible-newer-jinja.patch b/ansible-newer-jinja.patch
index 575c161..815b411 100644
--- a/ansible-newer-jinja.patch
+++ b/ansible-newer-jinja.patch
@@ -1,6 +1,6 @@
-diff -up ansible-2.3.0.0/requirements.txt.bak ansible-2.3.0.0/requirements.txt
---- ansible-2.3.0.0/requirements.txt.bak	2017-04-12 08:37:59.217167604 -0700
-+++ ansible-2.3.0.0/requirements.txt	2017-04-12 08:38:33.969286602 -0700
+diff -Nur ansible-2.4.0.0.orig/requirements.txt ansible-2.4.0.0/requirements.txt
+--- ansible-2.4.0.0.orig/requirements.txt	2017-09-18 19:57:14.000000000 -0700
++++ ansible-2.4.0.0/requirements.txt	2017-09-24 12:06:01.891861185 -0700
 @@ -3,7 +3,7 @@
  # packages.  Thus, this should be the loosest set possible (only required
  # packages, not optional ones, and with the widest range of versions that could
@@ -9,4 +9,4 @@ diff -up ansible-2.3.0.0/requirements.txt.bak ansible-2.3.0.0/requirements.txt
 +jinja2 >= 2.6
  PyYAML
  paramiko
- pycrypto >= 2.6
+ cryptography
diff --git a/ansible.spec b/ansible.spec
index 6743944..6700357 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -20,7 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
 Version: 2.4.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: Development/Libraries
 License: GPLv3+
@@ -37,16 +37,6 @@ Patch100: ansible-newer-jinja.patch
 Url: http://ansible.com
 BuildArch: noarch
 
-%if 0%{?rhel} && 0%{?rhel} <= 5
-BuildRequires: python26-devel
-
-Requires: python26-PyYAML
-Requires: python26-paramiko
-Requires: python26-jinja2
-Requires: python26-keyczar
-
-%else
-
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 
@@ -101,7 +91,10 @@ Requires: python-httplib2
 Requires: python-setuptools
 Requires: python-six
 Requires: sshpass
+
+%if (0%{?fedora} ||  0%{?rhel} > 6)
 # needed for json_query filter
+# but avoid on rhel6 due to amazon linux conflicts
 Requires: python2-jmespath
 %endif
 
@@ -328,6 +321,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 25 2017 Kevin Fenzi <kevin@scrye.com> - 2.4.0.0-2
+- Rebase rhel6 jinja2 patch.
+- Conditionalize jmespath to work around amazon linux issues. Fixes bug #1494640
+
 * Tue Sep 19 2017 Kevin Fenzi <kevin@scrye.com> - 2.4.0.0-1
 - Update to 2.4.0.