From 6de457f2bc2c4c5b02450bd9b9e9e3babee58661 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Mon, 14 Aug 2017 12:58:57 -0400 Subject: [PATCH] python-avocado.spec: fix dependency on Python YAML packages This change is already present on the downstream (Fedora/EPEL) packages, and for some reason, was missing here. It causes the installation to be attempted by pip, which should never be done during RPM builds. Signed-off-by: Cleber Rosa --- python-avocado.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/python-avocado.spec b/python-avocado.spec index 1bdba1c8..8f3361a5 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: 52.0 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?gitrel}%{?dist} License: GPLv2 Group: Development/Tools URL: http://avocado-framework.github.io/ @@ -59,6 +59,11 @@ BuildRequires: python-aexpect %if %{with_tests} BuildRequires: libvirt-python BuildRequires: perl-Test-Harness +%if 0%{?rhel} +BuildRequires: python-yaml +%else +BuildRequires: python2-yaml +%endif %endif Requires: gdb @@ -310,7 +315,11 @@ server. %package plugins-varianter-yaml-to-mux Summary: Avocado plugin to generate variants out of yaml files Requires: %{name} == %{version} +%if 0%{?rhel} Requires: python-yaml +%else +Requires: python2-yaml +%endif %description plugins-varianter-yaml-to-mux Can be used to produce multiple test variants with test parameters @@ -334,6 +343,9 @@ examples of how to write tests on your own. %{_datadir}/avocado/wrappers %changelog +* Mon Aug 14 2017 Cleber Rosa - 52.0-2 +- Add python[2]-yaml requirements + * Tue Jun 27 2017 Cleber Rosa - 52.0-1 - Fix python-aexpect depedency on EL7 -- GitLab