From 803303e8f78e7e8eb6685d225a18f0056fc08d844679f59d5637591798f4bcba Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 9 Aug 2022 10:30:31 +0000 Subject: [PATCH 1/2] Accepting request 993941 from home:cgiboudeaux:branches:KDE:Qt5 - Fix the dist_info folder name with python3-setuptools 63 The dist-info folder created with recent setuptools already contains the version. OBS-URL: https://build.opensuse.org/request/show/993941 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=62 --- python3-pyside2.changes | 7 +++++++ python3-pyside2.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/python3-pyside2.changes b/python3-pyside2.changes index 724f233..89edcd6 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 9 08:25:41 UTC 2022 - Christophe Giboudeaux + +- Fix the dist_info folder name with python3-setuptools 63 + The dist-info folder created with recent setuptools already + contains the version. + ------------------------------------------------------------------- Fri Jul 1 08:06:29 UTC 2022 - Christophe Giboudeaux diff --git a/python3-pyside2.spec b/python3-pyside2.spec index 8b1cf98..005131d 100644 --- a/python3-pyside2.spec +++ b/python3-pyside2.spec @@ -178,7 +178,11 @@ python3 setup.py dist_info for d in *.dist-info; do # the commands were copied verbatim, not wrapped by entry-points. rm -f $d/entry_points.txt +%if %{pkg_vcmp python3-setuptools < 63} cp -r $d %{buildroot}%{python3_sitearch}/${d/.dist-info/-%{version}.dist-info} +%else + cp -r $d %{buildroot}%{python3_sitearch}/${d} +%endif done # Examples must be installed manually From 100cf4832bf71ec1a2ccae97d1c3a27001dc352db6d33fffbc355d3197b78473 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 9 Aug 2022 10:30:50 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python3-pyside2?expand=0&rev=63 --- python3-pyside2.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-pyside2.changes b/python3-pyside2.changes index 89edcd6..060f1cc 100644 --- a/python3-pyside2.changes +++ b/python3-pyside2.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Aug 9 08:25:41 UTC 2022 - Christophe Giboudeaux -- Fix the dist_info folder name with python3-setuptools 63 +- Fix the dist-info folder name with python3-setuptools 63 The dist-info folder created with recent setuptools already contains the version.