Accepting request 304288 from network:utilities
1 OBS-URL: https://build.opensuse.org/request/show/304288 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=95
This commit is contained in:
commit
d5d1ba19ff
@ -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
|
||||
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user