From 19cd06ed0925fecfc1d80fc9687b15d935464d81 Mon Sep 17 00:00:00 2001
From: Iryna Shcherbina <shcherbina.iryna@gmail.com>
Date: Mon, 26 Mar 2018 23:55:30 +0200
Subject: [PATCH] Update Python 2 dependency declarations to new packaging
 standards

---
 python-avocado.spec | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/python-avocado.spec b/python-avocado.spec
index 658c7a9..a3e326a 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -34,7 +34,7 @@
 
 Name: python-%{pkgname}
 Version: 52.0
-Release: 4%{?gitrel}%{?dist}
+Release: 5%{?gitrel}%{?dist}
 Summary: Framework with tools and libraries for Automated Testing
 Group: Development/Tools
 # Found licenses:
@@ -53,17 +53,17 @@ Source0: https://github.com/avocado-framework/%{srcname}/archive/%{commit}.tar.g
 Patch0: avocado-selftest-doublefree-disable.patch
 BuildArch: noarch
 BuildRequires: fabric
-BuildRequires: pystache
+BuildRequires: python2-pystache
 BuildRequires: python2-aexpect
 BuildRequires: python2-devel
-BuildRequires: python-docutils
-BuildRequires: python-flexmock
-BuildRequires: python-lxml
+BuildRequires: python2-docutils
+BuildRequires: python2-flexmock
+BuildRequires: python2-lxml
 BuildRequires: python2-mock
-BuildRequires: python-resultsdb_api
+BuildRequires: python2-resultsdb_api
 
 %if 0%{?with_tests}
-BuildRequires: libvirt-python
+BuildRequires: python2-libvirt
 BuildRequires: perl(TAP::Parser)
 %if 0%{?rhel}
 BuildRequires: python-yaml
@@ -125,7 +125,7 @@ Requires: fabric
 Requires: gdb
 Requires: gdb-gdbserver
 Requires: pyliblzma
-Requires: pystache
+Requires: python2-pystache
 Requires: python2
 
 %if 0%{?rhel}
@@ -156,7 +156,7 @@ these days a framework) to perform automated testing.
 Summary: Avocado HTML report plugin
 %{?python_provide:%python_provide python2-%{pkgname}-plugins-output-html}
 Requires: python2-%{pkgname} == %{version}-%{release}
-Requires: pystache
+Requires: python2-pystache
 
 %description -n python2-%{pkgname}-plugins-output-html
 Adds to avocado the ability to generate an HTML report at every job results
@@ -183,7 +183,7 @@ Summary: Avocado Runner for libvirt VM Execution
 %{?python_provide:%python_provide python2-%{pkgname}-plugins-runner-vm}
 Requires: python2-%{pkgname} == %{version}-%{release}
 Requires: python2-%{pkgname}-plugins-runner-remote == %{version}-%{release}
-Requires: libvirt-python
+Requires: python2-libvirt
 
 %description -n python2-%{pkgname}-plugins-runner-vm
 Allows Avocado to run jobs on a libvirt based VM, by means of
@@ -208,7 +208,7 @@ be previously installed on the container.
 Summary: Avocado plugin to propagate job results to ResultsDB
 %{?python_provide:%python_provide python2-%{pkgname}-plugins-resultsdb}
 Requires: python2-%{pkgname} == %{version}-%{release}
-Requires: python-resultsdb_api
+Requires: python2-resultsdb_api
 
 %description -n python2-%{pkgname}-plugins-resultsdb
 Allows Avocado to send job results directly to a ResultsDB
@@ -408,6 +408,10 @@ find %{buildroot}%{_docdir}/avocado -type f -name '*.py' -exec %{__chmod} -c -x
 
 
 %changelog
+* Mon Mar 26 2018 Iryna Shcherbina <ishcherb@redhat.com> - 52.0-5
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 52.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild