[packages/wireshark] - upstream switched to Qt5

[baggins]

commit cf725e93fd516be7a70fefa239034c75c4f2eb0e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 6 22:19:50 2015 +0200

    - upstream switched to Qt5

 wireshark-ac.patch | 20 ++++++++++++++++++++
 wireshark.spec     | 13 +++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/wireshark.spec b/wireshark.spec
index 67ca27a..8963c15 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -62,9 +62,10 @@ BuildRequires:	pkgconfig
 %{?with_gui:BuildRequires:	portaudio-devel}
 BuildRequires:	rpmbuild(macros) >= 1.527
 %if %{with qt}
-BuildRequires:	QtCore-devel >= 4.6.0
-BuildRequires:	QtGui-devel
-BuildRequires:	qt4-build
+BuildRequires:	Qt5Core-devel
+BuildRequires:	Qt5PrintSupport-devel
+BuildRequires:	Qt5Widgets-devel
+BuildRequires:	qt5-build
 %endif
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
@@ -266,11 +267,11 @@ find -name Makefile.am | xargs sed -i -e 's/-Werror//g'
 %{__aclocal} -I aclocal-fallback
 %{__autoconf}
 %{__automake}
-%configure \
 %if %{with qt}
-        MOC=moc-qt4 \
-        UIC=uic-qt4 \
+MOC=moc-qt5 \
+UIC=uic-qt5 \
 %endif
+%configure \
 	--enable-dftest \
 	--enable-packet-editor \
 	--enable-randpkt \
diff --git a/wireshark-ac.patch b/wireshark-ac.patch
index eb53a85..5976bc2 100644
--- a/wireshark-ac.patch
+++ b/wireshark-ac.patch
@@ -30,3 +30,23 @@
  	  fi
  	  AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
  	else
+--- wireshark-1.12.4/configure.ac~	2015-03-04 18:08:41.000000000 +0100
++++ wireshark-1.12.4/configure.ac	2015-08-06 22:12:48.770312334 +0200
+@@ -1569,7 +1569,7 @@
+ # installed; if they're still doing that in current Fedora releases,
+ # perhaps there will also be XXX-qt5 when they pick up Qt 5.
+ #
+-AC_PATH_PROG(UIC, uic)
++AC_PATH_PROG(UIC, uic-qt5)
+ if test "x$UIC" = x
+ then
+ 	AC_PATH_PROG(UIC, uic-qt4)
+@@ -1595,7 +1595,7 @@
+ 	fi
+ fi
+ AC_SUBST(UIC)
+-AC_PATH_PROG(MOC, moc)
++AC_PATH_PROG(MOC, moc-qt5)
+ if test "x$MOC" = x
+ then
+ 	AC_PATH_PROG(MOC, moc-qt4)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wireshark.git/commitdiff/cf725e93fd516be7a70fefa239034c75c4f2eb0e