- adapt specfile requirements for RedHat and Fedora

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ansible?expand=0&rev=29
This commit is contained in:
Lars Vogdt 2014-08-17 15:35:44 +00:00 committed by Git OBS Bridge
parent 0ee17bf335
commit 7d1fb61231
2 changed files with 12 additions and 0 deletions

View File

@ -55,6 +55,7 @@ Sun Aug 17 15:21:38 UTC 2014 - lars@linux-schulserver.de
data returned from lookup plugins (CVE-2014-4966) data returned from lookup plugins (CVE-2014-4966)
+ Make sure vars don't insert extra parameters into module args and + Make sure vars don't insert extra parameters into module args and
prevent duplicate params from superseding previous params (CVE-2014-4967) 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 Thu Jul 10 12:53:16 UTC 2014 - lars@linux-schulserver.de

View File

@ -58,22 +58,32 @@ BuildArch: noarch
# #
%if 0%{?rhel} && 0%{?rhel} <= 5 %if 0%{?rhel} && 0%{?rhel} <= 5
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?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-devel
BuildRequires: python26-setuptools BuildRequires: python26-setuptools
Requires: python26-PyYAML Requires: python26-PyYAML
Requires: python26-httplib2 Requires: python26-httplib2
Requires: python26-httplib2
Requires: python26-jinja2 Requires: python26-jinja2
Requires: python26-keyczar Requires: python26-keyczar
Requires: python26-paramiko Requires: python26-paramiko
Requires: python26-setuptools
%endif %endif
%if 0%{?rhel} > 5 || 0%{?rhel_version} > 505 %if 0%{?rhel} > 5 || 0%{?rhel_version} > 505
BuildRequires: python26-devel BuildRequires: python26-devel
BuildRequires: python26-setuptools BuildRequires: python26-setuptools
Requires: python26-PyYAML Requires: python26-PyYAML
Requires: python26-httplib2 Requires: python26-httplib2
Requires: python26-httplib2
Requires: python26-jinja2 Requires: python26-jinja2
Requires: python26-keyczar Requires: python26-keyczar
Requires: python26-paramiko Requires: python26-paramiko
Requires: python26-setuptools
%endif
%if 0%{?rhel} == 6
Requires: python-crypto2.6
%endif %endif
# #
# Fedora # Fedora
@ -83,6 +93,7 @@ BuildRequires: python-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
Requires: PyYAML Requires: PyYAML
Requires: python-httplib2 Requires: python-httplib2
Requires: python-httplib2
Requires: python-jinja2 Requires: python-jinja2
Requires: python-keyczar Requires: python-keyczar
Requires: python-paramiko Requires: python-paramiko