From 78c3559b4dc2df940d471c00d2a7aaebdad03579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 17 Jan 2020 18:41:46 +0100
Subject: [PATCH] Update to 1.14.0 (#1768982) for Python 3.9 support (#1788494)

- Drop old obsoletes for platform-python-six
- Minor spec cleanup
---
 .gitignore      |  1 +
 python-six.spec | 18 +++++++++++-------
 sources         |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index a90ff13..c6a7ff9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /six-1.10.0.tar.gz
 /six-1.11.0.tar.gz
 /six-1.12.0.tar.gz
+/six-1.14.0.tar.gz
diff --git a/python-six.spec b/python-six.spec
index 854cab8..c7a80f4 100644
--- a/python-six.spec
+++ b/python-six.spec
@@ -3,19 +3,20 @@
 # tests are enabled by default, but on Fedora 32+, Python 2 tests are skipped
 %bcond_without tests
 
-# python2 is enabled by default, Fedora 32+ exception is anticipated
+# python2 is enabled by default, Fedora 32+ exception is for offlineimap
+# https://pagure.io/fesco/issue/2274
 %bcond_without python2
 
 %global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl
 
 Name:           python-%{modname}
-Version:        1.12.0
-Release:        7%{?dist}
+Version:        1.14.0
+Release:        1%{?dist}
 Summary:        Python 2 and 3 compatibility utilities
 
 License:        MIT
 URL:            https://pypi.python.org/pypi/six
-Source0:        https://files.pythonhosted.org/packages/source/%(n=%{modname}; echo ${n:0:1})/%{modname}/%{modname}-%{version}.tar.gz
+Source0:        %{pypi_source %{modname}}
 
 BuildArch:      noarch
 
@@ -46,7 +47,6 @@ Python 2 version.
 %package -n python3-%{modname}
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{modname}}
-Obsoletes:      platform-python-%{modname} < %{version}-%{release}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-pip
@@ -83,9 +83,9 @@ Python 3 version.
 %if %{with tests}
 %check
 %if %{with python2} && 0%{?fedora} < 32
-PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -rfsxX test_six.py
+PYTHONPATH=%{buildroot}%{python2_sitelib} pytest-2 -rfsxX test_six.py
 %endif
-PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -rfsxX test_six.py
+PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-3 -rfsxX test_six.py
 %endif
 
 
@@ -106,6 +106,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -rfsxX test_six.py
 
 
 %changelog
+* Fri Jan 17 2020 Miro Hrončok <mhroncok@redhat.com> - 1.14.0-1
+- Update to 1.14.0 (#1768982) for Python 3.9 support (#1788494)
+- Drop old obsoletes for platform-python-six
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-7
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
diff --git a/sources b/sources
index ad9734b..d0cde48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (six-1.12.0.tar.gz) = 937728372edf1e0ac13bbd706723d0de35e015c30d0ae41f789c5ed2e3669bb0db70cdc6e036ec2d437a6c4aa0d5d1e727b6d09ac34cca7e4e92e5d3b4775151
+SHA512 (six-1.14.0.tar.gz) = 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e