From 55659cab0ef3ffaec052f31e18a70263241d4ab2 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Aug 21 2020 12:29:06 +0000
Subject: Update to 49.6.0


Setuptools now has a "_distutils_hack" module that replaces the stdlib
"distutils" by setuptools._distutils whenever SETUPTOOLS_USE_DISTUTILS=local
is set. This will become the default in version 50.0.
The stdlib distutils module is deprecated and might be removed in some
future version of Python.
See: https://setuptools.readthedocs.io/en/latest/distutils-legacy.html

See CHANGES.rst for more changes.

---

diff --git a/pytest-no-cov.patch b/pytest-no-cov.patch
new file mode 100644
index 0000000..e27e90c
--- /dev/null
+++ b/pytest-no-cov.patch
@@ -0,0 +1,10 @@
+diff -U3 -r setuptools-49.6.0-orig/pytest.ini setuptools-49.6.0/pytest.ini
+--- setuptools-49.6.0-orig/pytest.ini	2020-08-20 14:51:59.289846443 +0200
++++ setuptools-49.6.0/pytest.ini	2020-08-20 14:52:34.089859558 +0200
+@@ -1,5 +1,5 @@
+ [pytest]
+-addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt --cov -r sxX
++addopts=--doctest-modules --doctest-glob=pkg_resources/api_tests.txt -r sxX
+ norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor
+ doctest_optionflags=ELLIPSIS ALLOW_UNICODE
+ filterwarnings =
diff --git a/python-setuptools.spec b/python-setuptools.spec
index a9c8e1b..ff0b7d5 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -13,7 +13,7 @@
 
 Name:           python-setuptools
 # When updating, update the bundled libraries versions bellow!
-Version:        49.1.3
+Version:        49.6.0
 Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 # setuptools is MIT
@@ -28,6 +28,9 @@ License:        MIT and (BSD or ASL 2.0)
 URL:            https://pypi.python.org/pypi/%{srcname}
 Source0:        %{pypi_source %{srcname} %{version} zip}
 
+# Do not run coverage and lint as part of the test suite
+Patch0:         pytest-no-cov.patch
+
 BuildArch:      noarch
 
 BuildRequires:  gcc
@@ -39,6 +42,7 @@ BuildRequires:  python3-pytest
 BuildRequires:  python3-mock
 BuildRequires:  python3-pytest-fixture-config
 BuildRequires:  python3-pytest-virtualenv
+BuildRequires:  python3-jaraco-envs
 %endif # with tests
 %if %{without bootstrap}
 BuildRequires:  python3-pip
@@ -62,7 +66,7 @@ execute the software that requires pkg_resources.
 # %%{_rpmconfigdir}/pythonbundles.py pkg_resources/_vendor/vendored.txt
 %global bundled %{expand:
 Provides: bundled(python3dist(appdirs)) = 1.4.3
-Provides: bundled(python3dist(packaging)) = 19.2
+Provides: bundled(python3dist(packaging)) = 20.4
 Provides: bundled(python3dist(pyparsing)) = 2.2.1
 Provides: bundled(python3dist(six)) = 1.10
 }
@@ -166,6 +170,8 @@ PYTHONPATH=$(pwd) %pytest --ignore=pavement.py
 %{python3_sitelib}/easy_install.py
 %{python3_sitelib}/pkg_resources/
 %{python3_sitelib}/setuptools*/
+%{python3_sitelib}/_distutils_hack/
+%{python3_sitelib}/distutils-precedence.pth
 %{python3_sitelib}/__pycache__/*
 %{_bindir}/easy_install
 %{_bindir}/easy_install-3.*
@@ -180,6 +186,9 @@ PYTHONPATH=$(pwd) %pytest --ignore=pavement.py
 
 
 %changelog
+* Fri Aug 21 2020 Petr Viktorin <pviktori@redhat.com> - 49.6.0-1
+- Update to 49.6.0 (#1862791)
+
 * Wed Jul 29 2020 Miro Hrončok <mhroncok@redhat.com> - 49.1.3-1
 - Update to 49.1.3 (#1853597)
 - https://setuptools.readthedocs.io/en/latest/history.html#v49-1-3
diff --git a/sources b/sources
index 6d334ec..87c6c54 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setuptools-49.1.3.zip) = dcad685319a4863e754dec2406d9ce88740c12d54f8a0b04a790e54836346370ea86388c79e40fc6296ebd13bc645b6a3f6a78f987ef12e3e8f598be194c0d52
+SHA512 (setuptools-49.6.0.zip) = aad6e74b0e276da0f79c9429860a6d1c7860a30e9a02ce55527abbe7671366640423a1e5476da9ecadfc62ae1bf803cb0c664e2a09cf7619a9c8ac3965b9cf31