From 66faf4f718d9fb7fcc59a4c68aff27b8db536e60 Mon Sep 17 00:00:00 2001
From: Kamil Páral <kparal@redhat.com>
Date: Jan 10 2018 11:05:31 +0000
Subject: update python deps to python2 deps


Fixes https://src.fedoraproject.org/rpms/libtaskotron/pull-request/1

---

diff --git a/libtaskotron.spec b/libtaskotron.spec
index 3558c50..566662e 100644
--- a/libtaskotron.spec
+++ b/libtaskotron.spec
@@ -1,7 +1,7 @@
 Name:           libtaskotron
 # NOTE: if you update version, *make sure* to also update `libtaskotron/__init__.py`
 Version:        0.4.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Taskotron Support Library
 
 License:        GPLv3
@@ -24,18 +24,28 @@ libtaskotron package is a meta-package which will install all sub-packages.
 Summary:        The minimal, core parts of libtaskotron
 
 Requires:       libtaskotron-config = %{version}-%{release}
-Requires:       python-configparser >= 3.5.0b2
-Requires:       python-jinja2 >= 2.8
+Requires:       python2-configparser >= 3.5.0b2
+Requires:       python2-jinja2 >= 2.8
+%if 0%{?fedora} <= 27
 Requires:       python-progressbar >= 2.3
 Requires:       python-resultsdb_api >= 2.0.0
 Requires:       python-requests >= 2.7.0
 Requires:       python-setuptools
 Requires:       python-xunitparser >= 1.3.3
 Requires:       PyYAML >= 3.11
+%else
+Requires:       python2-progressbar >= 2.3
+Requires:       python2-resultsdb_api >= 2.0.0
+Requires:       python2-requests >= 2.7.0
+Requires:       python2-setuptools
+Requires:       python2-xunitparser >= 1.3.3
+Requires:       python2-pyyaml >= 3.11
+%endif
 Requires:       sudo
 Requires:       tar >= 1.28-6
 BuildRequires:  python2-devel
-BuildRequires:  python-configparser >= 3.5.0b2
+BuildRequires:  python2-configparser >= 3.5.0b2
+%if 0%{?fedora} <= 27
 BuildRequires:  python-dingus >= 0.3.4
 BuildRequires:  python-mock >= 2.0.0
 BuildRequires:  python-progressbar >= 2.3
@@ -47,6 +57,19 @@ BuildRequires:  python-setuptools
 BuildRequires:  python2-sphinx_rtd_theme >= 0.1.9
 BuildRequires:  python-xunitparser >= 1.3.3
 BuildRequires:  PyYAML >= 3.11
+%else
+BuildRequires:  python2-dingus >= 0.3.4
+BuildRequires:  python2-mock >= 2.0.0
+BuildRequires:  python2-progressbar >= 2.3
+BuildRequires:  python2-pytest >= 2.7.3
+BuildRequires:  python2-pytest-cov >= 2.2.1
+BuildRequires:  python2-resultsdb_api >= 2.0.0
+BuildRequires:  python2-requests >= 2.7.0
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-sphinx_rtd_theme >= 0.1.9
+BuildRequires:  python2-xunitparser >= 1.3.3
+BuildRequires:  python2-pyyaml >= 3.11
+%endif
 
 %description -n libtaskotron-core
 The minimal, core parts of libtaskotron that are needed to run tasks
@@ -70,20 +93,28 @@ Requires:       koji >= 1.10.0
 %endif
 Requires:       libtaskotron-core = %{version}-%{release}
 Requires:       mash
-Requires:       python-fedora >= 0.8.0
-Requires:       python-hawkey >= 0.4.13-1
+Requires:       python2-fedora >= 0.8.0
+Requires:       python2-hawkey >= 0.4.13-1
+%if 0%{?fedora} <= 27
 Requires:       python-munch >= 2.0.2
-Requires:       rpm-python
+%else
+Requires:       python2-munch >= 2.0.2
+%endif
+Requires:       python2-rpm
 %if 0%{?fedora} >= 27
 BuildRequires:  python2-koji >= 1.10.0
 %else
 BuildRequires:  koji >= 1.10.0
 %endif
 BuildRequires:  mash
-BuildRequires:  python-fedora >= 0.8.0
-BuildRequires:  python-hawkey >= 0.4.13-1
-BuildRequires:  python-rpmfluff >= 0.5.1
+BuildRequires:  python2-fedora >= 0.8.0
+BuildRequires:  python2-hawkey >= 0.4.13-1
+BuildRequires:  python2-rpmfluff >= 0.5.1
+%if 0%{?fedora} <= 27
 BuildRequires:  python-munch >= 2.0.2
+%else
+BuildRequires:  python2-munch >= 2.0.2
+%endif
 
 %description -n libtaskotron-fedora
 Module for libtaskotron which contains all functionality which is fedora-only
@@ -92,9 +123,9 @@ Module for libtaskotron which contains all functionality which is fedora-only
 Summary:        disposable client module for libtaskotron
 
 Requires:       libtaskotron-core = %{version}-%{release}
-Requires:       python-paramiko >= 1.15.1
+Requires:       python2-paramiko >= 1.15.1
 Requires:       testcloud >= 0.1.15
-BuildRequires:  python-paramiko >= 1.15.1
+BuildRequires:  python2-paramiko >= 1.15.1
 BuildRequires:  testcloud >= 0.1.15
 
 %description -n libtaskotron-disposable
@@ -179,6 +210,11 @@ install -d %{buildroot}/%{_sharedstatedir}/taskotron/images
 %{python2_sitelib}/libtaskotron/ext/disposable/*
 
 %changelog
+* Wed Jan 10 2018 Kamil Páral <kparal@redhat.com> - 0.4.25-2
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 and
+  https://src.fedoraproject.org/rpms/libtaskotron/pull-request/1)
+
 * Thu Nov 23 2017 Kamil Páral <kparal@redhat.com> - 0.4.25-1
 - update yumrepoinfo
 - update to latest testcloud API