From 7d1fb61231ff4b8667b3a90056e800f5df9187d7 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sun, 17 Aug 2014 15:35:44 +0000 Subject: [PATCH] - adapt specfile requirements for RedHat and Fedora OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ansible?expand=0&rev=29 --- ansible.changes | 1 + ansible.spec | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/ansible.changes b/ansible.changes index e614aa4..a22601b 100644 --- a/ansible.changes +++ b/ansible.changes @@ -55,6 +55,7 @@ Sun Aug 17 15:21:38 UTC 2014 - lars@linux-schulserver.de data returned from lookup plugins (CVE-2014-4966) + Make sure vars don't insert extra parameters into module args and prevent duplicate params from superseding previous params (CVE-2014-4967) +- adapt specfile requirements for RedHat and Fedora ------------------------------------------------------------------- Thu Jul 10 12:53:16 UTC 2014 - lars@linux-schulserver.de diff --git a/ansible.spec b/ansible.spec index 0a8fe2d..5651c41 100644 --- a/ansible.spec +++ b/ansible.spec @@ -58,22 +58,32 @@ BuildArch: noarch # %if 0%{?rhel} && 0%{?rhel} <= 5 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%if 0%{?rhel} == 5 +%define __python /usr/bin/python26 +%endif BuildRequires: python26-devel BuildRequires: python26-setuptools Requires: python26-PyYAML Requires: python26-httplib2 +Requires: python26-httplib2 Requires: python26-jinja2 Requires: python26-keyczar Requires: python26-paramiko +Requires: python26-setuptools %endif %if 0%{?rhel} > 5 || 0%{?rhel_version} > 505 BuildRequires: python26-devel BuildRequires: python26-setuptools Requires: python26-PyYAML Requires: python26-httplib2 +Requires: python26-httplib2 Requires: python26-jinja2 Requires: python26-keyczar Requires: python26-paramiko +Requires: python26-setuptools +%endif +%if 0%{?rhel} == 6 +Requires: python-crypto2.6 %endif # # Fedora @@ -83,6 +93,7 @@ BuildRequires: python-devel BuildRequires: python-setuptools Requires: PyYAML Requires: python-httplib2 +Requires: python-httplib2 Requires: python-jinja2 Requires: python-keyczar Requires: python-paramiko