From fe2f5e2cc2dd48ac08edd2d84eaa7feed0fc645838fa31a5065e8aeea0c4841f Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 11 Jan 2023 20:01:51 +0000 Subject: [PATCH 1/2] Accepting request 1057852 from KDE:Qt:6.4 - Fix condition to use llvm11 in SLE 15 SP5 instead of the default llvm7. OBS-URL: https://build.opensuse.org/request/show/1057852 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=34 --- qt6-tools.changes | 6 ++++++ qt6-tools.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/qt6-tools.changes b/qt6-tools.changes index b972e98..d0af84b 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 11 19:29:26 UTC 2023 - Antonio Larrosa + +- Fix condition to use llvm11 in SLE 15 SP5 instead of the default + llvm7. + ------------------------------------------------------------------- Fri Jan 6 16:46:53 UTC 2023 - Christophe Marin diff --git a/qt6-tools.spec b/qt6-tools.spec index f13b7d5..88727bd 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -47,7 +47,7 @@ Source13: org.qt.assistant6.desktop Source14: linguist6.png Source99: qt6-tools-rpmlintrc # clang-devel in Leap 15.3 points to clang7... -%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150300 +%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150300 BuildRequires: clang11-devel %else BuildRequires: clang-devel >= 8 From 0cbb9cf38d2975462971bdd36b4af186aa9d7dbeadc5bf4dc1ba696bc0bb0a3a Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 11 Jan 2023 20:31:12 +0000 Subject: [PATCH 2/2] Accepting request 1057858 from KDE:Qt:6.4 - Leap 15.4 doesn't have llvm11 but llvm13 so just use that in SP4 and llvm15 in SP5. OBS-URL: https://build.opensuse.org/request/show/1057858 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=35 --- qt6-tools.changes | 6 ++++++ qt6-tools.spec | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/qt6-tools.changes b/qt6-tools.changes index d0af84b..6f5c823 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 11 20:07:37 UTC 2023 - Antonio Larrosa + +- Leap 15.4 doesn't have llvm11 but llvm13 so just use that in + SP4 and llvm15 in SP5. + ------------------------------------------------------------------- Wed Jan 11 19:29:26 UTC 2023 - Antonio Larrosa diff --git a/qt6-tools.spec b/qt6-tools.spec index 88727bd..1626d1e 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -1,7 +1,7 @@ # # spec file for package qt6-tools # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,12 +46,16 @@ Source13: org.qt.assistant6.desktop # The 48x48 icon was removed from qttools Source14: linguist6.png Source99: qt6-tools-rpmlintrc -# clang-devel in Leap 15.3 points to clang7... -%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150300 -BuildRequires: clang11-devel +# clang-devel in Leap 15 points to clang7... +%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150400 +BuildRequires: clang13-devel +%else +%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150500 +BuildRequires: clang15-devel %else BuildRequires: clang-devel >= 8 %endif +%endif BuildRequires: hicolor-icon-theme BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel