[qt5-qtbase: 2/2] cleaner xkbcommon logic

[Rex Dieter]

commit 77d9cc7b0ff67cb5927d9581348a5686277a74cf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jul 18 14:16:41 2014 -0500

    cleaner xkbcommon logic

 qt5-qtbase.spec |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index ec8f240..35c6355 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -111,19 +111,18 @@ BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(NetworkManager)
 BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
-%if 0%{?fedora} > 20
+%if 0%{?fedora}
 %global xkbcommon -system-xkbcommon
+%if 0%{?fedora} > 20
 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
 BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
-%endif
-%if 0%{?fedora} && 0%{?fedora} < 20
-# else apply our patch to support the old versions of xcb and xkbcommon
+%else
+# apply patch to support older versions of xcb and xkbcommon
 %global old_xcb 1
-%global xkbcommon -system-xkbcommon
 BuildRequires: pkgconfig(xkbcommon)
 %endif
-%if ! 0%{?xkbcommon:1}
+%else
 %global xkbcommon -qt-xkbcommon
 Provides: bundled(libxkbcommon) = 0.4.1
 %endif