From 46c3f4aecb6e8ce07baca199cf5fa6e69438d7a079a157bd86ab790b0dfaa0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 18 Jun 2024 16:20:57 +0000 Subject: [PATCH] Accepting request 1177271 from home:mlin7442:rebuild_fails_156 fix test fail for Leap 15.6 OBS-URL: https://build.opensuse.org/request/show/1177271 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-QDarkStyle?expand=0&rev=19 --- python-QDarkStyle.changes | 5 +++++ python-QDarkStyle.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/python-QDarkStyle.changes b/python-QDarkStyle.changes index d5a3d9e..fc13ca0 100644 --- a/python-QDarkStyle.changes +++ b/python-QDarkStyle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 23 08:16:14 UTC 2024 - Max Lin + +- Fix test on Leap 15.6 + ------------------------------------------------------------------- Fri Nov 24 20:29:15 UTC 2023 - Ben Greiner diff --git a/python-QDarkStyle.spec b/python-QDarkStyle.spec index 401e1a1..3c55b60 100644 --- a/python-QDarkStyle.spec +++ b/python-QDarkStyle.spec @@ -46,7 +46,12 @@ BuildRequires: %{python_module QDarkStyle = %{version}} BuildRequires: %{python_module QtPy >= 2} BuildRequires: %{python_module qt5-devel} # pyside2 is for primary python3 flavor only +# but the exception was in Leap 15.6 has both built with 3.6 and 3.11 +%if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150500 +BuildRequires: %{python_module pyside2} +%else BuildRequires: python3-pyside2 +%endif BuildRequires: xvfb-run %endif %python_subpackages @@ -77,7 +82,7 @@ sed -i '1{\,^#!%{_bindir}/env python,d}' qdarkstyle/*.py qdarkstyle/*/*.py export LANG=C.UTF-8 %python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} xvfb-run $python -B -m qdarkstyle.example --qt_from=pyqt5 --test # pyside2 is for primary python3 flavor only -PYTHONPATH=%{buildroot}%{python3_sitelib} xvfb-run python3 -B -m qdarkstyle.example --qt_from=pyside2 --test +PYTHONPATH=%{buildroot}%{python3_sitelib} xvfb-run python%{python_bin_suffix} -B -m qdarkstyle.example --qt_from=pyside2 --test # no qtsass compiler (extras_require 'develop') #%%pytest %endif