From 1f20cdffe654125ad775345c0ea62e35ada08dee0a2aa2cbdc140b37ecd6abf4 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 28 Apr 2015 07:10:21 +0000 Subject: [PATCH] Accepting request 304276 from home:elvigia:branches:network:utilities - Build the qt frontend against QT5 in Factory (only). OBS-URL: https://build.opensuse.org/request/show/304276 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=140 --- wireshark.changes | 5 +++++ wireshark.spec | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/wireshark.changes b/wireshark.changes index 36fdd37..ff9e99f 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 28 02:13:25 UTC 2015 - crrodriguez@opensuse.org + +- Build the qt frontend against QT5 in Factory (only). + ------------------------------------------------------------------- Thu Apr 9 10:23:11 UTC 2015 - dimstar@opensuse.org diff --git a/wireshark.spec b/wireshark.spec index 68929e6..568f208 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -54,11 +54,18 @@ BuildRequires: gtk2-devel >= 2.12.0 %endif # use_gtk3 %endif # with gtk %if %{with qt} +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) +%else %if 0%{?suse_version} >= 1220 BuildRequires: pkgconfig(QtCore) >= 4.6.0 %else BuildRequires: libqt4-devel >= 4.6.0 %endif # 12.20 +%endif %endif # with qt BuildRequires: krb5-devel BuildRequires: libcap-devel @@ -192,6 +199,12 @@ autoreconf -fiv export CFLAGS="%optflags -fPIE" export CXXFLAGS="%optflags -fPIE" export LDFLAGS="-pie" + +%if 0%{?suse_version} > 1320 +#XXX: buggy autoconf checks.. +export PATH="%{_libdir}/qt5/bin:$PATH" +%endif + %configure \ %if 0%{?suse_version} < 1220 --without-zlib \