diff --git a/bugfix-eliminate-random-order-in-metadata.patch b/bugfix-eliminate-random-order-in-metadata.patch deleted file mode 100644 index a99903e412cfe233ff3f2b0f1fcf9128ebe5f728..0000000000000000000000000000000000000000 --- a/bugfix-eliminate-random-order-in-metadata.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 99ba862948c27f8851ae2131ff36daee0195ae4a Mon Sep 17 00:00:00 2001 -From: chengzihan2 -Date: Thu, 4 Jun 2020 17:29:07 +0800 -Subject: [PATCH] bugfix eliminate random order in metadata - ---- - setuptools/dist.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setuptools/dist.py b/setuptools/dist.py -index f0f030b..d22e533 100644 ---- a/setuptools/dist.py -+++ b/setuptools/dist.py -@@ -194,7 +194,7 @@ def write_pkg_file(self, file): - self.long_description_content_type - ) - if self.provides_extras: -- for extra in self.provides_extras: -+ for extra in sorted(self.provides_extras): - write_field('Provides-Extra', extra) - - --- -2.23.0 - 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 a81bb70e5ac902b2ae8764f954d7284242b0bc47..d3b93381a1bd93cc4d9619919e7508cb55cae0e0 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -7,18 +7,15 @@ %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 Name: python-setuptools -Version: 41.2.0 -Release: 3 +Version: 49.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 -Patch9000: bugfix-eliminate-random-order-in-metadata.patch BuildArch: noarch %if %{with python2} @@ -39,8 +36,6 @@ BuildRequires: python3-pytest-virtualenv %endif BuildRequires: python3-pip, python3-wheel -Provides: python-distribute = %{version}-%{release}, %{name}-wheel -Obsoletes: python-distribute < 0.6.36-2, %{name}-wheel %description Setuptools is a collection of enhancements to the Python distutils that allow @@ -79,7 +74,7 @@ execute the software that requires pkg_resources.py. %package_help %prep -%autosetup -n setuptools-%{version} -p1 +%autosetup -n setuptools-%{version} find setuptools pkg_resources -name \*.py | xargs sed -i -e '1 {/^#!\//d}' rm -f setuptools/*.exe @@ -144,6 +139,9 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Fri Jul 24 2020 tianwei - 49.2.0-1 +- update to release to 49.2.0 + * Thu Jun 4 2020 chengzihan - 41.2.0-3 - bugfix eliminate random order in metadata diff --git a/setuptools-41.2.0.zip b/setuptools-41.2.0.zip deleted file mode 100644 index e2cb40dfae8844746f97fdf465454b56e037c359..0000000000000000000000000000000000000000 Binary files a/setuptools-41.2.0.zip and /dev/null differ diff --git a/setuptools-49.2.0.zip b/setuptools-49.2.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..9a09b85c7d8f574844d785dc14565456fa742372 Binary files /dev/null and b/setuptools-49.2.0.zip differ