From ddc67a25dde3b93863a6f0e7ba74fe9d65725947 Mon Sep 17 00:00:00 2001 From: chengzihan2 Date: Thu, 4 Jun 2020 17:59:44 +0800 Subject: [PATCH] bugfix eliminate random order in metadata --- ...x-eliminate-random-order-in-metadata.patch | 25 +++++++++++++++++++ python-setuptools.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 bugfix-eliminate-random-order-in-metadata.patch diff --git a/bugfix-eliminate-random-order-in-metadata.patch b/bugfix-eliminate-random-order-in-metadata.patch new file mode 100644 index 0000000..a99903e --- /dev/null +++ b/bugfix-eliminate-random-order-in-metadata.patch @@ -0,0 +1,25 @@ +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/python-setuptools.spec b/python-setuptools.spec index 77c844e..a81bb70 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -11,13 +11,14 @@ Name: python-setuptools Version: 41.2.0 -Release: 2 +Release: 3 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} @@ -143,6 +144,9 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Thu Jun 4 2020 chengzihan - 41.2.0-3 +- bugfix eliminate random order in metadata + * Thu Jun 4 2020 chengzihan - 41.2.0-2 - Upgrade package to version 41.2.0 -- Gitee