From ae99d390ee2b67220880ba250aa554d5f629a171 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Wed, 21 Jul 2021 14:42:18 +0200
Subject: [PATCH] Update to 20.6.0

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

diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index 3c44180..9adde67 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -1,6 +1,6 @@
 Name:           python-virtualenv
-Version:        20.4.7
-Release:        3%{?dist}
+Version:        20.6.0
+Release:        1%{?dist}
 Summary:        Tool to create isolated Python environments
 
 License:        MIT
@@ -12,10 +12,10 @@ Patch1: rpm-wheels.patch
 
 BuildArch:      noarch
 
-BuildRequires:  python3-appdirs
 BuildRequires:  python3-devel
 BuildRequires:  python3-distlib
 BuildRequires:  python3-filelock
+BuildRequires:  python3-platformdirs
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools_scm
 BuildRequires:  python3-six
@@ -57,11 +57,6 @@ licensed under an MIT-style permissive license.
 %package -n     python3-virtualenv
 Summary:        Tool to create isolated Python environments
 
-Requires:       python3-appdirs
-Requires:       python3-distlib
-Requires:       python3-filelock
-Requires:       python3-setuptools
-Requires:       python3-six
 Obsoletes:      python3-virtualenv-python26 < 16.6
 %{?python_provide:%python_provide python3-virtualenv}
 
@@ -91,7 +86,14 @@ Documentation for python virtualenv.
 
 %prep
 %autosetup -p1 -n virtualenv-%{version}
-%{__sed} -i -e "1s|#!/usr/bin/env python||" tasks/update_embedded.py
+sed -i -e "1s|#!/usr/bin/env python||" tasks/update_embedded.py
+
+# The version of importlib.metadata we have in Python 3.10 in rawhide
+# is new enough so we do not need this compatibility package.
+# For older releases, we just need to switch this to importlib_metadata
+# and add appropriate runtime dependency (importlib_metadate>=3.6).
+sed -i "s/backports.entry_points_selectable/importlib.metadata/" src/virtualenv/run/plugin/base.py
+sed -i "/backports.entry_points_selectable/d" setup.cfg
 
 # Remove the wheels provided by RPM packages
 rm src/virtualenv/seed/wheels/embed/pip-*
@@ -150,6 +152,10 @@ rm -r tmp_path
 
 
 %changelog
+* Wed Jul 21 2021 Lumír Balhar <lbalhar@redhat.com> - 20.6.0-1
+- Update to 20.6.0
+Resolves: rhbz#1981792
+
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 20.4.7-3
 - Rebuilt for Python 3.10
 
diff --git a/sources b/sources
index 5114c6b..54e7f4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virtualenv-20.4.7.tar.gz) = a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
+SHA512 (virtualenv-20.6.0.tar.gz) = 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c