From f3064745444fea0fefa0f4595c6524527ccacaeb Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 23 Jan 2018 11:34:13 -0500 Subject: [PATCH] SPEC: require a lower six version on EL7 Unless a lower version is set as a requirement, the RPM building process will attempt to download from PyPI, which is not allowed. Signed-off-by: Cleber Rosa --- python-avocado.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-avocado.spec b/python-avocado.spec index 97f2907f..0740e79d 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -29,7 +29,7 @@ Summary: Framework with tools and libraries for Automated Testing Name: python-%{srcname} Version: 58.0 -Release: 0%{?gitrel}%{?dist} +Release: 1%{?gitrel}%{?dist} License: GPLv2 Group: Development/Tools URL: http://avocado-framework.github.io/ @@ -116,6 +116,9 @@ these days a framework) to perform automated testing. sed -e "s/'libvirt-python'//" -i optional_plugins/runner_vm/setup.py %build +%if 0%{?rhel} == 7 +sed -e "s/'six>=1.10.0'/'six>=1.9.0'/" -i setup.py +%endif %{__python} setup.py build pushd optional_plugins/html %{__python} setup.py build @@ -460,6 +463,9 @@ Again Shell code (and possibly other similar shells). %{_libexecdir}/avocado* %changelog +* Tue Jan 23 2018 Cleber Rosa - 58.0-1 +- Require a lower six version on EL7 + * Tue Jan 23 2018 Cleber Rosa - 58.0-0 - New upstream release -- GitLab