From d15605b2093e4d8c84d7873de973e55aeb9bd57d8841a357e018d490d4b31c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sat, 20 Feb 2016 18:00:59 +0000 Subject: [PATCH] Accepting request 360636 from home:elvigia:branches:hardware - spec: Compile the GUI against QT5 in 13.2 and later. OBS-URL: https://build.opensuse.org/request/show/360636 OBS-URL: https://build.opensuse.org/package/show/hardware/wpa_supplicant?expand=0&rev=61 --- wpa_supplicant.changes | 5 +++++ wpa_supplicant.spec | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/wpa_supplicant.changes b/wpa_supplicant.changes index 6bc18dd..f47dbf2 100644 --- a/wpa_supplicant.changes +++ b/wpa_supplicant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 20 16:56:01 UTC 2016 - crrodriguez@opensuse.org + +- spec: Compile the GUI against QT5 in 13.2 and later. + ------------------------------------------------------------------- Thu Feb 18 15:36:23 UTC 2016 - crrodriguez@opensuse.org diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 0105cbc..eb56715 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -43,8 +43,14 @@ Patch3: wpa_supplicant-alloc_size.patch Patch4: wpa_supplicant-getrandom.patch BuildRequires: dbus-1-devel BuildRequires: libnl3-devel +%if 0%{?suse_version} < 1320 BuildRequires: libqt4 BuildRequires: libqt4-devel +%else +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +%endif BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: readline-devel @@ -82,7 +88,11 @@ cp %{SOURCE1} wpa_supplicant/.config cd wpa_supplicant CFLAGS="%{optflags}" make V=1 %{?_smp_mflags} cd wpa_gui-qt4 +%if 0%{?suse_version} < 1320 qmake QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}" +%else +qmake-qt5 QMAKE_CXXFLAGS="%{optflags}" QMAKE_CFLAGS="%{optflags}" +%endif make %{?_smp_mflags} %install