From acd6ff08baf40745b776fa33b3aa4d7141fe99fb926a3a70ae0e6fdaa2bd9be8 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 24 Dec 2021 10:37:02 +0000 Subject: [PATCH] Accepting request 942121 from home:alarrosa:branches:KDE:Qt6 - Use clang11 in SLE15 SP4 and newer too, not just in SLE15 SP3 OBS-URL: https://build.opensuse.org/request/show/942121 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=15 --- qt6-tools.changes | 5 +++++ qt6-tools.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qt6-tools.changes b/qt6-tools.changes index 18f723d..1a7182e 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 22 13:42:30 UTC 2021 - Antonio Larrosa + +- Use clang11 in SLE15 SP4 and newer too, not just in SLE15 SP3 + ------------------------------------------------------------------- Wed Dec 1 10:06:30 UTC 2021 - Christophe Giboudeaux diff --git a/qt6-tools.spec b/qt6-tools.spec index d706c6b..8c427f5 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -36,7 +36,7 @@ Summary: Qt 6 Tools libraries and tools # qdoc is GPL-3.0-only WITH Qt-GPL-exception-1.0 + (LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)) == GPL-3.0-only # src/shared contains BSD-3-Clause and LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) files. The # 'GPL-3.0-only WITH Qt-GPL-exception-1.0' files in this folder are only used on Windows. -License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-only WITH Qt-GPL-exception-1.0 +License: ((GPL-2.0-only OR GPL-3.0-or-later) AND GPL-3.0-only WITH Qt-GPL-exception-1.0) OR LGPL-3.0-only URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source10: org.qt.designer6.desktop @@ -45,7 +45,7 @@ Source12: org.qt.qdbusviewer6.desktop Source13: org.qt.assistant6.desktop 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 @@ -242,6 +242,7 @@ License: GPL-3.0-only %description qdoc Qt 6 Tool used by Qt to generate documentation. + ### Private only library ### %package -n libQt6DesignerComponents6