From ab14ec2cdbbec9f92761879c60f0381469f477f9 Mon Sep 17 00:00:00 2001 From: chenjianhu Date: Thu, 18 Dec 2025 12:39:04 +0000 Subject: [PATCH] =?UTF-8?q?remove=20conflicting=20settings=20from=20the=20?= =?UTF-8?q?python3-setuptools=20sub-package.=20python3-setuptools=E7=9A=84?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=AE=BE=E7=BD=AE=E6=88=90=E4=BA=86python-se?= =?UTF-8?q?tuptools=EF=BC=8C=E4=BD=86=E6=98=AFpython-setuptools=E5=8C=85?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=86=85=E5=AE=B9=E6=98=AFsetuptools?= =?UTF-8?q?=E7=9A=84wheel=E5=8C=85=EF=BC=8C=E4=B8=8Epython3-setuptools?= =?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=AD=90=E5=8C=85=E5=B9=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python-setuptools.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index a56df50..a31bc4a 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 78.1.1 -Release: 4 +Release: 5 Summary: Easily build and distribute Python packages License: MIT AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0) AND Python-2.0 AND LGPL-3.0-only @@ -39,7 +39,6 @@ This package contains a python wheel of setuptools to use with venv. %package -n python3-setuptools Summary: Easily build and distribute Python 3 packages -Conflicts: python-setuptools < %{version}-%{release} Provides: python%{python3_pkgversion}dist(setuptools) = %{version} Provides: python%{python3_version}dist(setuptools) = %{version} Requires: (gobject-introspection-devel >= 1.81.2 if gobject-introspection-devel) @@ -108,6 +107,9 @@ PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(pwd) py.test-%{python3_version} --ignore= %changelog +* Thu Dec 18 2025 chenjianhu - 78.1.1-5 +- update License + * Thu Aug 28 2025 fuanan - 78.1.1-4 - update License -- Gitee