From 0e2a444500c20ec9fd6f433582f28e20369b06de Mon Sep 17 00:00:00 2001
From: Tomas Hrnciar <thrnciar@redhat.com>
Date: Wed, 29 Apr 2020 13:50:31 +0200
Subject: [PATCH] Update to 20.1

---
 python-pip.spec | 10 +++++++++-
 sources         |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/python-pip.spec b/python-pip.spec
index 4db7070..4e438c9 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -4,7 +4,6 @@
 
 %global srcname pip
 %global base_version 20.1
-%global prerel b1
 %global upstream_version %{base_version}%{?prerel}
 %global python_wheelname %{srcname}-%{upstream_version}-py2.py3-none-any.whl
 %global python_wheeldir %{_datadir}/python-wheels
@@ -205,6 +204,12 @@ Recommends:     python%{python3_pkgversion}-setuptools
 Provides:       pip = %{version}-%{release}
 Conflicts:      python-pip < %{version}-%{release}
 
+# %%pyX_install_wheel and %%pyproject_install was adapted to workaround PEP 610 handling in pip 20.1+
+# (This explicit conflict can be removed after we update to Python 3.9)
+Conflicts: python-rpm-macros < 3.8-4
+Conflicts: python3-rpm-macros < 3.8-4
+Conflicts: pyproject-rpm-macros < 0-15
+
 %{crypt_compat_recommends 3}
 
 %description -n python%{python3_pkgversion}-%{srcname}
@@ -389,6 +394,9 @@ ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
 %{python_wheeldir}/%{python_wheelname}
 
 %changelog
+* Wed Apr 29 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1-1
+- Update to 20.1
+
 * Mon Apr 27 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1~b1-1
 - Update to 20.1~b1
 
diff --git a/sources b/sources
index f35021c..9e4b99a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (pip-20.1b1.tar.gz) = 61ea2014895500f68fed8168a904ca581d4e0939e8152f439b797b9905f9e2987bb320a3102a0e2357ec7d8fdad9e75bf7079e14e50477304d763496b1719187
+SHA512 (pip-20.1.tar.gz) = 19cc1172540bec4b0c6facf55fa9c463bf8f4391dd1a643ac208c8e0b787950b2d72a6ec8f0772c7e6582c6b6a4a103f31ad58ffa2119fb574c174e5ec77b0c1
 SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409
 SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d