From 35eb21a12dc638871c046b1fe7e0c942fa882c6d Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Tue, 29 Aug 2017 11:50:56 +0200 Subject: [PATCH] Fix deletion of /usr/bin/easy_install during bootstrap --- python-setuptools.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 18ca022..db0d8f6 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -209,15 +209,16 @@ find %{buildroot}%{platform_python_sitelib} -name '*.exe' | xargs rm -f %if %{without bootstrap} %py3_install_wheel %{python3_wheelname} -# TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to -# (pip install wheel doesn't overwrite) -rm %{buildroot}%{_bindir}/easy_install - +# Remove /usr/bin/easy_install from the record as later on we delete the file sed -i '/\/usr\/bin\/easy_install,/d' %{buildroot}%{python3_record} %else %py3_install %endif +# TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to +# (pip install wheel doesn't overwrite) +rm %{buildroot}%{_bindir}/easy_install + rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests %if %{without bootstrap} sed -i '/^setuptools\/tests\//d' %{buildroot}%{python3_record}