rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

cleaner xkbcommon logic

Browse Source
This commit is contained in:
Rex Dieter 2014-07-18 14:16:41 -05:00
parent 1415157eb4
commit 77d9cc7b0f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qt5-qtbase.spec
View File

@ -111,19 +111,18 @@ BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(NetworkManager) BuildRequires: pkgconfig(NetworkManager)
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
%if 0%{?fedora} > 20 %if 0%{?fedora}
%global xkbcommon -system-xkbcommon %global xkbcommon -system-xkbcommon
%if 0%{?fedora} > 20
BuildRequires: pkgconfig(xcb-xkb) >= 1.10 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1
%endif %else
%if 0%{?fedora} && 0%{?fedora} < 20 # apply patch to support older versions of xcb and xkbcommon
# else apply our patch to support the old versions of xcb and xkbcommon
%global old_xcb 1 %global old_xcb 1
%global xkbcommon -system-xkbcommon
BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon)
%endif %endif
%if ! 0%{?xkbcommon:1} %else
%global xkbcommon -qt-xkbcommon %global xkbcommon -qt-xkbcommon
Provides: bundled(libxkbcommon) = 0.4.1 Provides: bundled(libxkbcommon) = 0.4.1
%endif %endif