From 03fb4aeaf5aa067fef086d8e82c7e618a4d4d129 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: May 07 2018 16:39:08 +0000
Subject: Revert "Remove the python2 version", Python 2 is needed


See https://bugzilla.redhat.com/show_bug.cgi?id=1575667

This reverts commit 0f06d08a6c7497ab3a7ea68ddf4b3c27df504152.

---

diff --git a/python-tox.spec b/python-tox.spec
index 52e94a5..3001a71 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -7,7 +7,7 @@
 %global pypiname tox
 Name:           python-%{pypiname}
 Version:        2.9.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
@@ -27,6 +27,35 @@ can use for:
  - acting as a frontend to Continuous Integration servers, greatly reducing
    boilerplate and merging CI and shell-based testing.
 
+%package -n     python2-%{pypiname}
+Summary:        %{summary}
+%{?python_provide:%python_provide python2-%{pypiname}}
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-setuptools_scm
+
+%if %{with internet}
+# for tests
+BuildRequires:  python2-py
+BuildRequires:  python2-pytest
+BuildRequires:  python2-virtualenv >= 1.11.2
+%endif
+
+%?python_enable_dependency_generator
+
+%description -n python2-%{pypiname}
+Tox as is a generic virtualenv management and test command line tool you
+can use for:
+
+ - checking your package installs correctly with different Python versions
+   and interpreters
+ - running your tests in each of the environments, configuring your test tool
+   of choice
+ - acting as a frontend to Continuous Integration servers, greatly reducing
+   boilerplate and merging CI and shell-based testing.
+
+This package contains just the module you can import from Python 2,
+for the actual command line utility, dnf install tox.
 
 %package -n python3-%{pypiname}
 Summary:        %{summary}
@@ -49,9 +78,6 @@ Recommends:     pypy3-devel
 Recommends:     python2-devel
 Recommends:     python3-devel
 
-# Replace the python2 version
-Obsoletes:      python2-tox < 2.9.1-4
-
 %if %{with internet}
 # for tests
 BuildRequires:  python3-py
@@ -59,8 +85,6 @@ BuildRequires:  python3-pytest
 BuildRequires:  python3-virtualenv
 %endif
 
-%?python_enable_dependency_generator
-
 %description -n python3-%{pypiname}
 Tox as is a generic virtualenv management and test command line tool you
 can use for:
@@ -79,18 +103,28 @@ can use for:
 rm -rf %{pypiname}.egg-info
 
 %build
+%py2_build
 %py3_build
 
 
 %install
+%py2_install
+rm %{buildroot}%{_bindir}/%{pypiname}*
+
 %py3_install
 
 # if internet connection available, run tests
 %if %{with internet}
 %check
+TOXENV=py27 %{__python2} setup.py test
 TOXENV=py%{python3_version_nodots} %{__python3} setup.py test
 %endif
 
+%files -n python2-%{pypiname}
+%license LICENSE
+%{python2_sitelib}/%{pypiname}
+%{python2_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
+
 %files -n python3-%{pypiname}
 %{_bindir}/%{pypiname}
 %{_bindir}/%{pypiname}-quickstart
@@ -98,6 +132,9 @@ TOXENV=py%{python3_version_nodots} %{__python3} setup.py test
 %{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Mon May 07 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-5
+- Add python2 back, see #1575667
+
 * Mon Apr 30 2018 Miro Hrončok <mhroncok@redhat.com> - 2.9.1-4
 - Remove the python2 version