From f1dfb1e2082984cd8de8958f195b6720e649d0d9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 12 Nov 2014 12:47:30 -0600 Subject: [PATCH] add versioned Requires: libxkbcommon dep --- qt5-qtbase.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index daa552e..5563c21 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -29,7 +29,7 @@ Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.3.2 -Release: 4%{?dist} +Release: 4%{?dist}.1 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -142,6 +142,8 @@ BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 %if 0%{?fedora} > 19 # Fedora 20 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 +%global xkbcommon_version %(pkg-config --modversion xkbcommon 2> /dev/null || echo '0.4.1') +Requires: libxkbcommon%{?_isa} >= %{xkbcommon_version} %else # Fedora 19 and older BuildRequires: pkgconfig(xkbcommon) @@ -768,6 +770,9 @@ fi %changelog +* Wed Nov 12 2014 Rex Dieter 5.3.2-4.1 +- add versioned Requires: libxkbcommon dep + * Thu Oct 23 2014 Kevin Kofler - 5.3.2-4 - -gui: don't require gtk2 (__requires_exclude_from platformthemes) (#1154884)