diff --git a/python-setuptools.changes b/python-setuptools.changes index 876dac4..77d1033 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). + ------------------------------------------------------------------- Tue Dec 8 02:15:26 UTC 2020 - Matej Cepl diff --git a/python-setuptools.spec b/python-setuptools.spec index 77e2868..65e8ba4 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 @@ -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}