From c3b686ca071ae149d5d2ecd4d7f383eca793b03e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 29 Nov 2020 01:14:45 -0600 Subject: [PATCH] drop vulkan support on s390x (#1902449) --- qt5-qtbase.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index c91e3c7..b44c656 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -51,7 +51,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.2 -Release: 3%{?dist} +Release: 4%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -176,7 +176,10 @@ BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 BuildRequires: pkgconfig(xkeyboard-config) +%ifnarch s390x +%global vulkan 1 BuildRequires: pkgconfig(vulkan) +%endif %if 0%{?fedora} || 0%{?rhel} > 6 %global egl 1 BuildRequires: libEGL-devel @@ -264,7 +267,9 @@ Requires: %{name}-gui%{?_isa} Requires: libEGL-devel %endif Requires: pkgconfig(gl) +%if 0%{?vulkan} Requires: pkgconfig(vulkan) +%endif Requires: qt5-rpm-macros %if 0%{?use_clang} Requires: clang >= 3.7.0 @@ -1046,6 +1051,9 @@ fi %changelog +* Sun Nov 29 2020 Rex Dieter - 5.15.2-4 +- drop vulkan support on s390x (#1902449) + * Fri Nov 27 2020 Jan Grulich - 5.15.2-3 - Require qt-settings only in Fedora builds