diff --git a/ansible-newer-jinja.patch b/ansible-newer-jinja.patch index 815b411..c393067 100644 --- a/ansible-newer-jinja.patch +++ b/ansible-newer-jinja.patch @@ -1,7 +1,7 @@ -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 @@ +diff -Nur ansible-2.4.1.0.orig/requirements.txt ansible-2.4.1.0/requirements.txt +--- ansible-2.4.1.0.orig/requirements.txt 2017-10-25 16:05:04.000000000 -0700 ++++ ansible-2.4.1.0/requirements.txt 2017-10-30 14:41:31.202896847 -0700 +@@ -3,8 +3,8 @@ # packages. Thus, this should be the loosest set possible (only required # packages, not optional ones, and with the widest range of versions that could # be suitable) @@ -9,4 +9,6 @@ diff -Nur ansible-2.4.0.0.orig/requirements.txt ansible-2.4.0.0/requirements.txt +jinja2 >= 2.6 PyYAML paramiko - cryptography +-cryptography ++pycrypto >= 2.6 + setuptools diff --git a/ansible.spec b/ansible.spec index 142db17..10264cf 100644 --- a/ansible.spec +++ b/ansible.spec @@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Name: ansible Summary: SSH-based configuration management, deployment, and task execution system Version: 2.4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: GPLv3+ @@ -41,6 +41,14 @@ Patch100: ansible-newer-jinja.patch Url: http://ansible.com BuildArch: noarch +%if 0%{?rhel} && 0%{?rhel} <= 5 +# On RHEL6 use the python26 stack +BuildRequires: python26-devel +Requires: python26-PyYAML +Requires: python26-paramiko +Requires: python26-jinja2 +%endif + BuildRequires: python2-devel BuildRequires: python-setuptools @@ -331,6 +339,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 30 2017 Kevin Fenzi kevin@scrye.com - 2.4.1.0-2 +- Add PR to conditionalize docs building. Thanks tibbs! +- Fix up el6 patches + * Thu Oct 26 2017 Kevin Fenzi - 2.4.1.0-1 - Update to 2.4.1