From 760e26f6bc8423aec750512111c8c62aa90e792f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 15 Mar 2021 16:57:01 +0100
Subject: [PATCH] Remove python2-six, offlineimap has switched to Python 3

---
 python-six.spec | 53 +++++--------------------------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

diff --git a/python-six.spec b/python-six.spec
index fd35911..8d9fbcb 100644
--- a/python-six.spec
+++ b/python-six.spec
@@ -1,22 +1,13 @@
 %global modname six
 
-# tests are enabled by default, but on Fedora 32+, Python 2 tests are skipped
+# tests are enabled by default
 %bcond_without tests
 
-# python2 is enabled by default, Fedora 32+ exception is for offlineimap
-# https://pagure.io/fesco/issue/2274
-# The exception applies to Fedora only and has no target release yet
-%if 0%{?fedora}
-%bcond_without python2
-%else
-%bcond_with python2
-%endif
-
 %global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl
 
 Name:           python-%{modname}
 Version:        1.15.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python 2 and 3 compatibility utilities
 
 License:        MIT
@@ -34,24 +25,6 @@ Python 2 and Python 3.
 
 %description %{_description}
 
-%if %{with python2}
-%package -n python2-%{modname}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{modname}}
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-
-%if %{with tests} && 0%{?fedora} < 32
-BuildRequires:  python2-pytest
-BuildRequires:  python2-tkinter
-%endif
-
-%description -n python2-%{modname} %{_description}
-Python 2 version.
-
-%endif
-
-
 %package -n python%{python3_pkgversion}-%{modname}
 Summary:        %{summary}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
@@ -74,37 +47,18 @@ Python 3 version.
 
 
 %build
-%if %{with python2}
-%py2_build
-%endif
-
 %py3_build_wheel
 
 
 %install
-%if %{with python2}
-%py2_install
-%endif
-
 %py3_install_wheel %{python_wheelname}
 
 %if %{with tests}
 %check
-%if %{with python2} && 0%{?fedora} < 32
-PYTHONPATH=%{buildroot}%{python2_sitelib} pytest-2 -rfsxX test_six.py
-%endif
 PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-3 -rfsxX test_six.py
 %endif
 
 
-%if %{with python2}
-%files -n python2-%{modname}
-%license LICENSE
-%doc README.rst documentation/index.rst
-%{python2_sitelib}/%{modname}-*.egg-info/
-%{python2_sitelib}/%{modname}.py*
-%endif
-
 %files -n python%{python3_pkgversion}-%{modname}
 %license LICENSE
 %doc README.rst documentation/index.rst
@@ -114,6 +68,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-3 -rfsxX test_six.py
 
 
 %changelog
+* Mon Mar 15 2021 Miro Hrončok <mhroncok@redhat.com> - 1.15.0-5
+- Remove python2-six
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild