From b812ac7b9923f0beef922289f731252bf92d2792b374c310f5346eaadfc1dbf7 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 19 Apr 2024 22:14:14 +0000 Subject: [PATCH] Accepting request 1168476 from home:mlin7442:rebuild_fails_156 fix the test flavor build on Leap 15 OBS-URL: https://build.opensuse.org/request/show/1168476 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-QtPy?expand=0&rev=50 --- python-QtPy.changes | 6 ++++++ python-QtPy.spec | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/python-QtPy.changes b/python-QtPy.changes index cabe073..e32c518 100644 --- a/python-QtPy.changes +++ b/python-QtPy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 16 11:01:50 UTC 2024 - Max Lin + +- Make sure to use pytest-3.11 on Leap15.6 +- To buildrequires python 3.11 version of pyside6 and pyside2 + ------------------------------------------------------------------- Tue Nov 21 13:39:59 UTC 2023 - Dirk Müller diff --git a/python-QtPy.spec b/python-QtPy.spec index 49f5b76..137049a 100644 --- a/python-QtPy.spec +++ b/python-QtPy.spec @@ -34,7 +34,10 @@ BuildArch: noarch %bcond_with pyside2 %bcond_with pyside6 %endif - +# make sure using pytest-3.11 on Leap 15.6 +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150500 +%define python3_bin_suffix 3.11 +%endif %{?sle15_python_module_pythons} Name: python-QtPy%{psuffix} Version: 2.4.1 @@ -87,10 +90,18 @@ BuildRequires: %{python_module PyQt6-WebEngine} %endif %endif %if %{with pyside2} +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150500 +BuildRequires: %{python_module pyside2} +%else BuildRequires: python3-pyside2 %endif +%endif %if %{with pyside6} +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150500 +BuildRequires: %{python_module pyside6} +%else BuildRequires: python3-pyside6 +%endif BuildRequires: qt6-sql-sqlite %endif %endif