From 3ae0724acb025b1ee508779938e32b59f471eb55 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 12 Jun 2016 08:24:03 -0500 Subject: [PATCH] add versioned qt5-qtbase runtime dep User reported after recent rawhide 5.6.1 update: Cannot mix incompatible Qt library (version 0x50600) with this library (version 0x50601) --- qt5-qtwebengine.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 70dc3ec..5413fba 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -30,7 +30,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.6.1 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -85,6 +85,8 @@ Patch7: qtwebengine-opensource-src-5.6.1-no-sse2.patch ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: qt5-qtbase-private-devel +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: qt5-qtxmlpatterns-devel >= %{version} BuildRequires: qt5-qtlocation-devel >= %{version} @@ -439,6 +441,9 @@ popd %changelog +* Sun Jun 12 2016 Rex Dieter - 5.6.1-2 +- add versioned qt5-qtbase runtime dep + * Sat Jun 11 2016 Kevin Kofler - 5.6.1-1 - Update to 5.6.1 - Rebase linux-pri patch (drop the parts already fixed upstream)