From 94d0a9ea749b1199562a82d0e5d094dd2769d28dc17dd3f6be6d5753344a0a4e Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 23 Mar 2021 12:54:45 +0000 Subject: [PATCH] Accepting request 880593 from home:cgiboudeaux:branches:KDE:Qt6 - Work around boo#1179155 and explicitly require clang11 for Leap 15.3. OBS-URL: https://build.opensuse.org/request/show/880593 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-tools?expand=0&rev=2 --- qt6-tools.changes | 6 ++++++ qt6-tools.spec | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/qt6-tools.changes b/qt6-tools.changes index 819f6d9..681529b 100644 --- a/qt6-tools.changes +++ b/qt6-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 22 17:21:47 UTC 2021 - Christophe Giboudeaux + +- Work around boo#1179155 and explicitly require clang11 + for Leap 15.3. + ------------------------------------------------------------------- Thu Mar 18 14:24:03 UTC 2021 - Guillaume GARDET diff --git a/qt6-tools.spec b/qt6-tools.spec index ea38575..05d5366 100644 --- a/qt6-tools.spec +++ b/qt6-tools.spec @@ -45,7 +45,12 @@ Source11: org.qt.linguist6.desktop Source12: org.qt.qdbusviewer6.desktop Source13: org.qt.assistant6.desktop Source99: qt6-tools-rpmlintrc -BuildRequires: clang-devel +# clang-devel in Leap 15.3 points to clang7... +%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150300 +BuildRequires: clang11-devel +%else +BuildRequires: clang-devel >= 8 +%endif BuildRequires: hicolor-icon-theme BuildRequires: qt6-core-private-devel BuildRequires: qt6-dbus-private-devel @@ -228,8 +233,7 @@ Command line client for communication over D-Bus. Summary: Qt 6 Tool used by Qt to generate documentation License: GPL-3.0-only # qdoc hardcodes clang include paths: boo#1109367, QTBUG-70687 -%global _clang_major_version %(printf %{pkg_version clang-devel} | cut -d. -f1) -%requires_eq libclang%{_clang_major_version} +%requires_eq libclang%{_llvm_sonum} %description qdoc Qt 6 Tool used by Qt to generate documentation.