diff --git a/bugfix-eliminate-random-order-in-metadata.patch b/bugfix-eliminate-random-order-in-metadata.patch deleted file mode 100644 index f103434ea9cf13f1db8d235d8e1e376e58184fe5..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 fb16886..86a5402 100644 ---- a/setuptools/dist.py -+++ b/setuptools/dist.py -@@ -208,7 +208,7 @@ def write_pkg_file(self, file): # noqa: C901 # is too complex (14) # FIXME - if self.long_description_content_type: - write_field('Description-Content-Type', 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) - - self._write_list(file, 'License-File', self.license_files or []) --- -1.8.3.1 - diff --git a/python-setuptools.spec b/python-setuptools.spec index 537ad3f4992e120a7a902b7aab4113dd20744f4e..3585417dfaf1fad6aa208941c56254ecf367a7a3 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -7,7 +7,7 @@ %global python_whlname setuptools-%{version}-py3-none-any.whl Name: python-setuptools -Version: 68.0.0 +Version: 69.1.0 Release: 1 Summary: Easily build and distribute Python packages @@ -15,7 +15,6 @@ License: MIT and (BSD or ASL 2.0) URL: https://pypi.python.org/pypi/setuptools Source0: %{pypi_source setuptools %{version}} -Patch9000: bugfix-eliminate-random-order-in-metadata.patch BuildArch: noarch @@ -107,17 +106,20 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %files help %defattr(-,root,root) -%doc docs/* CHANGES.rst README.rst +%doc docs/* README.rst %changelog +* Thu Feb 22 2024 liweigang - 69.1.0-1 +- update package to version 69.1.0 + * Wed Jul 12 2023 sunhui - 68.0.0-1 - Update package to version 68.0.0 * Sat Jan 28 2023 zhuofeng - 66.0.0-1 - update version to 66.0.0 -* Wed Jan 04 2023 zhuofeng - 60.9.3-2 +* Wed Jan 04 2023 zhuofeng - 60.9.3-2 - Type:CVE - CVE:CVE-2022-40897 - SUG:NA diff --git a/setuptools-68.0.0.tar.gz b/setuptools-68.0.0.tar.gz deleted file mode 100644 index b2d8822260df88c3b4013337986da29fe6875451..0000000000000000000000000000000000000000 Binary files a/setuptools-68.0.0.tar.gz and /dev/null differ diff --git a/setuptools-69.1.0.tar.gz b/setuptools-69.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a671741111f645530236f1d339023a3398b576bd Binary files /dev/null and b/setuptools-69.1.0.tar.gz differ