Hello community,

here is the log from the commit of package wireshark for openSUSE:Factory 
checked in at 2015-04-28 20:48:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
 and      /work/SRC/openSUSE:Factory/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "wireshark"

Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes      2015-04-10 
10:20:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2015-04-28 
20:48:10.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 28 02:13:25 UTC 2015 - crrodrig...@opensuse.org
+
+- Build the qt frontend against QT5 in Factory (only). 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.L3Ls3J/_old  2015-04-28 20:48:12.000000000 +0200
+++ /var/tmp/diff_new_pack.L3Ls3J/_new  2015-04-28 20:48:12.000000000 +0200
@@ -54,11 +54,18 @@
 %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 @@
 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 \




Reply via email to