diff --git a/python-avocado.spec b/python-avocado.spec index 5f4e594..6a185f0 100644 --- a/python-avocado.spec +++ b/python-avocado.spec @@ -34,7 +34,7 @@ Name: python-%{pkgname} Version: 52.1 -Release: 3%{?gitrel}%{?dist} +Release: 4%{?gitrel}%{?dist} Summary: Framework with tools and libraries for Automated Testing Group: Development/Tools # Found licenses: @@ -53,7 +53,6 @@ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{commit}.tar.g Patch0: avocado-selftest-doublefree-disable.patch Patch1: avocado-selftest-fix-cmdline-check.patch BuildArch: noarch -BuildRequires: fabric BuildRequires: python2-pystache BuildRequires: python2-aexpect BuildRequires: python2-devel @@ -63,6 +62,12 @@ BuildRequires: python2-lxml BuildRequires: python2-mock BuildRequires: python2-resultsdb_api +%if 0%{?fedora} >= 29 +BuildRequires: python2-fabric3 +%else +BuildRequires: fabric +%endif + %if 0%{?with_tests} BuildRequires: python2-libvirt BuildRequires: perl(TAP::Parser) @@ -119,13 +124,18 @@ these days a framework) to perform automated testing. Summary: %{summary} License: GPLv2 and MIT %{?python_provide:%python_provide python2-%{pkgname}} -Requires: fabric Requires: gdb Requires: gdb-gdbserver Requires: pyliblzma Requires: python2-pystache Requires: python2 +%if 0%{?fedora} >= 29 +Requires: python2-fabric3 +%else +Requires: fabric +%endif + %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-requests Requires: python-stevedore @@ -166,10 +176,14 @@ arbitrary filesystem location. Summary: Avocado Runner for Remote Execution %{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-remote} Requires: python2-%{pkgname} == %{version}-%{release} -Requires: fabric %if 0%{?fedora} == 24 Requires: python-crypto %endif +%if 0%{?fedora} >= 29 +Requires: python2-fabric3 +%else +Requires: fabric +%endif %description -n python2-%{pkgname}-plugins-runner-remote Allows Avocado to run jobs on a remote machine, by means of an SSH @@ -252,6 +266,9 @@ examples of how to write tests on your own. # version of libvirt-python does not publish the egg info and this # causes that dep to be attempted to be installed by pip sed -e "s/'libvirt-python'//" -i optional_plugins/runner_vm/setup.py +%if 0%{?fedora} >= 29 +sed -e "s/'fabric'/'fabric3'/" -i optional_plugins/runner_remote/setup.py +%endif %build %{__python2} setup.py build @@ -419,6 +436,9 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x %changelog +* Mon May 14 2018 Merlin Mathesius - 52.1-4 +- Dependency fabric has been renamed to python2-fabric3 + * Mon May 14 2018 Merlin Mathesius - 52.1-3 - correct python_provide argument typo for varianter-yaml-to-mux plugin