From cb3478dd995dfa66eabec64c5bce78f82b78e49c Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Jan 10 2017 20:38:26 +0000
Subject: SPEC updates to build and install for EPEL.


---

diff --git a/python-avocado.spec b/python-avocado.spec
index 3f47426..e606419 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -1,8 +1,12 @@
 %global srcname avocado
 
+# selftests are provided but skipped because many contain race conditions
+# causing random build failures
+%global with_tests 0
+
 Name: python-%{srcname}
 Version: 43.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Framework with tools and libraries for Automated Testing
 Group: Development/Tools
 # Found licenses:
@@ -18,31 +22,42 @@ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{version}.tar.
 Source1: halflings-license.eml
 BuildArch: noarch
 BuildRequires: fabric
-BuildRequires: perl-Test-Harness
 BuildRequires: pystache
-BuildRequires: python2-devel
 BuildRequires: python2-aexpect
+BuildRequires: python2-devel
 BuildRequires: python-docutils
 BuildRequires: python-flexmock
 BuildRequires: python-lxml
 BuildRequires: python2-mock
+
+%if %{with_tests}
+BuildRequires: perl(TAP::Parser)
+%endif
+
+%if 0%{?rhel}
+BuildRequires: python-psutil
+BuildRequires: python-requests
+BuildRequires: python-setuptools
+BuildRequires: python-sphinx
+BuildRequires: python-stevedore
+BuildRequires: python-yaml
+%else
 BuildRequires: python2-psutil
 BuildRequires: python2-requests
 BuildRequires: python2-setuptools
 BuildRequires: python2-sphinx
 BuildRequires: python2-stevedore
-BuildRequires: yum
+BuildRequires: python2-yaml
+%endif
 
 %if 0%{?el6}
 BuildRequires: procps
-BuildRequires: python2-argparse
-BuildRequires: python2-importlib
-BuildRequires: python2-logutils
-BuildRequires: python2-unittest2
-BuildRequires: PyYAML
+BuildRequires: python-argparse
+BuildRequires: python-importlib
+BuildRequires: python-logutils
+BuildRequires: python-unittest2
 %else
 BuildRequires: procps-ng
-BuildRequires: python2-yaml
 %endif
 
 %if 0%{?fedora} >= 25
@@ -69,19 +84,25 @@ Requires: pyliblzma
 Requires: pystache
 Requires: python2
 Requires: python2-aexpect
+
+%if 0%{?rhel}
+Requires: python-requests
+Requires: python-stevedore
+Requires: python-yaml
+%else
 Requires: python2-requests
 Requires: python2-stevedore
+Requires: python2-yaml
+%endif
 
 %if 0%{?el6}
 Requires: procps
-Requires: python2-argparse
-Requires: python2-importlib
-Requires: python2-logutils
-Requires: python2-unittest2
-Requires: PyYAML
+Requires: python-argparse
+Requires: python-importlib
+Requires: python-logutils
+Requires: python-unittest2
 %else
 Requires: procps-ng
-Requires: python2-yaml
 %endif
 
 
@@ -142,9 +163,7 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x 
 
 
 %check
-%if 0
-# selftests are provided but skipped because many contain race conditions
-# causing random build failures
+%if %{with_tests}
 selftests/run
 %endif
 
@@ -195,5 +214,8 @@ selftests/run
 %{_docdir}/avocado/wrappers
 
 %changelog
+* Tue Jan 10 2017 Merlin Mathesius <mmathesi@redhat.com> - 43.0-7
+- SPEC updates to build and install for EPEL.
+
 * Mon Nov 21 2016 Merlin Mathesius <mmathesi@redhat.com> - 43.0-6
 - Initial packaging for Fedora.