From 730758f145be7bbe4ad14bf96fbf28d6f1207453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 29 Jul 2020 10:32:29 +0200
Subject: [PATCH] Update to 49.1.3

 - beware of the logo license/trademark (so far so good)
 - fix the list of licenses (no impact on the result, one MIT thing replaced with another)
 - sed out coverage from pytest.ini as well as linting

Related to https://bugzilla.redhat.com/show_bug.cgi?id=1853597

49.2.0 is intentionally skipped, see https://src.fedoraproject.org/rpms/python-setuptools/pull-request/43
---
 python-setuptools.spec | 20 ++++++++++++++------
 sources                |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/python-setuptools.spec b/python-setuptools.spec
index e562ced..a9c8e1b 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -13,14 +13,17 @@
 
 Name:           python-setuptools
 # When updating, update the bundled libraries versions bellow!
-Version:        47.3.1
-Release:        2%{?dist}
+Version:        49.1.3
+Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 # setuptools is MIT
+# appdirs is MIT
 # packaging is BSD or ASL 2.0
 # pyparsing is MIT
 # six is MIT
-# ordered-set is MIT
+# the setuptools logo has unknown license and possible TM problems,
+# but the sdist **does not** contain it,
+# see https://github.com/pypa/setuptools/issues/2227
 License:        MIT and (BSD or ASL 2.0)
 URL:            https://pypi.python.org/pypi/%{srcname}
 Source0:        %{pypi_source %{srcname} %{version} zip}
@@ -59,7 +62,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)) = 16.8
+Provides: bundled(python3dist(packaging)) = 19.2
 Provides: bundled(python3dist(pyparsing)) = 2.2.1
 Provides: bundled(python3dist(six)) = 1.10
 }
@@ -103,8 +106,9 @@ find setuptools pkg_resources -name \*.py | xargs sed -i -e '1 {/^#!\//d}'
 rm -f setuptools/*.exe
 # These tests require internet connection
 rm setuptools/tests/test_integration.py 
-# We don't do linting here
-sed -i 's/ --flake8//' pytest.ini
+# We don't do linting or coverage here
+sed -i pytest.ini -e 's/ --flake8//' \
+                  -e 's/ --cov//'
 
 %build
 # Warning, different bootstrap meaning here, has nothing to do with our bcond
@@ -176,6 +180,10 @@ PYTHONPATH=$(pwd) %pytest --ignore=pavement.py
 
 
 %changelog
+* 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
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 47.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 955fb34..6d334ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (setuptools-47.3.1.zip) = 05d8ac5e1612f0c22d9f51b5dbb22cdd1edfd9c15e97c5f31f6dee8d660e6ca19720cee5169158d0179baa87518766fda1cd2e4d5c69f683e973a9ff08155d48
+SHA512 (setuptools-49.1.3.zip) = dcad685319a4863e754dec2406d9ce88740c12d54f8a0b04a790e54836346370ea86388c79e40fc6296ebd13bc645b6a3f6a78f987ef12e3e8f598be194c0d52