diff --git a/create-site-packages.patch b/create-site-packages.patch deleted file mode 100644 index 60f9795e1d047c78473643391cbb37cf3b9bed4b..0000000000000000000000000000000000000000 --- a/create-site-packages.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 91c48b3..0c9b0f4 100755 ---- a/setuptools/command/easy_install.py -+++ b/setuptools/command/easy_install.py -@@ -446,6 +446,12 @@ class easy_install(Command): - instdir = normalize_path(self.install_dir) - pth_file = os.path.join(instdir, 'easy-install.pth') - -+ if not os.path.exists(instdir): -+ try: -+ os.makedirs(instdir) -+ except (OSError, IOError): -+ self.cant_write_to_target() -+ - # Is it a configured, PYTHONPATH, implicit, or explicit site dir? - is_site_dir = instdir in self.all_site_dirs - diff --git a/python-setuptools.spec b/python-setuptools.spec index 13f10e134283ce54d0b0415aadaa4555541ce2f1..1ffafc2df641b703c6094698635f5f7c81287038 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -3,17 +3,16 @@ %global python3_record %{python3_sitelib}/setuptools-%{version}.dist-info/RECORD %global python_whldir %{_datadir}/python-wheels -%global python_whlname setuptools-%{version}-py2.py3-none-any.whl +%global python_whlname setuptools-%{version}-py3-none-any.whl Name: python-setuptools -Version: 44.1.1 -Release: 2 +Version: 54.2.0 +Release: 1 Summary: Easily build and distribute Python packages License: MIT and (BSD or ASL 2.0) URL: https://pypi.python.org/pypi/setuptools -Source0: %{pypi_source setuptools %{version} zip} -Patch0: create-site-packages.patch +Source0: %{pypi_source setuptools %{version}} Patch9000: bugfix-eliminate-random-order-in-metadata.patch BuildArch: noarch @@ -64,12 +63,11 @@ chmod -x README.rst %install %py3_install_wheel %{python_whlname} sed -i '/\/usr\/bin\/easy_install,/d' %{buildroot}%{python3_record} -rm %{buildroot}%{_bindir}/easy_install -rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests +rm -rf %{buildroot}%{python3_sitelib}/{setuptools, pkg_resources}/tests sed -i '/^setuptools\/tests\//d' %{buildroot}%{python3_record} find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f -rm -r docs/{Makefile,conf.py,_*} +rm -r docs/{conf.py,_*} mkdir -p %{buildroot}%{python_whldir} install -p dist/%{python_whlname} -t %{buildroot}%{python_whldir} @@ -86,11 +84,10 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %files -n python3-setuptools %defattr(-,root,root) -%{_bindir}/easy_install-3.* -%{python3_sitelib}/easy_install.py %{python3_sitelib}/pkg_resources/ %{python3_sitelib}/setuptools*/ -%{python3_sitelib}/__pycache__/* +%{python3_sitelib}/distutils-precedence.pth +%{python3_sitelib}/_distutils_hack/ %files help %defattr(-,root,root) @@ -98,6 +95,9 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Mon Mar 29 2021 shixuantong - 54.2.0-1 +- upgrade version to 54.2.0 + * Mon Nov 2 2020 wangjie -44.1.1-2 - Type:NA - ID:NA diff --git a/setuptools-44.1.1.zip b/setuptools-44.1.1.zip deleted file mode 100644 index 3b6cfeeee615ba09ca3bbd3b2c9c81d17d9e3d35..0000000000000000000000000000000000000000 Binary files a/setuptools-44.1.1.zip and /dev/null differ diff --git a/setuptools-54.2.0.tar.gz b/setuptools-54.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..51c3cecc446f7c624434e41a30bf498c057499fa Binary files /dev/null and b/setuptools-54.2.0.tar.gz differ