From b0014cbe2f9ab4e3da84a8b1d52a40a18b081986a38550c2496f47d2d09e7501 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 20 Jan 2021 07:04:07 +0000 Subject: [PATCH 1/3] - Run spec-cleaner OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=211 --- python-setuptools.changes | 5 +++++ python-setuptools.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index 876dac4..e559af5 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 20 07:03:58 UTC 2021 - Matej Cepl + +- Run spec-cleaner + ------------------------------------------------------------------- Tue Dec 8 02:15:26 UTC 2020 - Matej Cepl diff --git a/python-setuptools.spec b/python-setuptools.spec index 77e2868..e478e22 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -1,7 +1,7 @@ # # spec file for package python-setuptools # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 0d4abacab11505069d0ba094b7167e1eb2fbf91373db55165f1e55d8827da98e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 22 Jan 2021 19:05:46 +0000 Subject: [PATCH 2/3] - We cannot remove vendored packages when generating setuptools wheel (bsc#1177127). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=212 --- python-setuptools.changes | 6 ++++++ python-setuptools.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/python-setuptools.changes b/python-setuptools.changes index e559af5..16bd944 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 22 19:05:02 UTC 2021 - Matej Cepl + +- We cannot remove vendored packages when generating setuptools + wheel (bsc#1177127). + ------------------------------------------------------------------- Wed Jan 20 07:03:58 UTC 2021 - Matej Cepl diff --git a/python-setuptools.spec b/python-setuptools.spec index e478e22..65e8ba4 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -118,6 +118,7 @@ chmod -x README.rst # replace with nothing sed -r -i '1s@^#!/.*$@@' setuptools/command/easy_install.py +%if ! %{with wheel} # replace the bundled stuff find ./ -type f -name \*.py -exec sed -i \ -e 's:from setuptools\.extern\.:from :g' \ @@ -132,6 +133,7 @@ find ./ -type f -name \*.py -exec sed -i \ find ./ -type f -name \*.py -exec sed -i \ -e 's:from .extern ::g' \ {} \; +%endif %build %if ! %{with wheel} From 7cabbfc77d3631ddb8fb98701d3c5d156885a8b7fcc15ec78049e21ac65a1462 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 22 Jan 2021 20:50:05 +0000 Subject: [PATCH 3/3] Remove superfluous comment. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=213 --- python-setuptools.changes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index 16bd944..77d1033 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -4,11 +4,6 @@ Fri Jan 22 19:05:02 UTC 2021 - Matej Cepl - We cannot remove vendored packages when generating setuptools wheel (bsc#1177127). -------------------------------------------------------------------- -Wed Jan 20 07:03:58 UTC 2021 - Matej Cepl - -- Run spec-cleaner - ------------------------------------------------------------------- Tue Dec 8 02:15:26 UTC 2020 - Matej Cepl