- upstream switched to Qt5

diff --git a/wireshark-ac.patch b/wireshark-ac.patch
index eb53a853565c224ca00ed0a1a3869a2b4033fb13..5976bc24409340d52ec15b9aa1a982f92745a74f 100644 (file)
--- 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)

diff --git a/wireshark.spec b/wireshark.spec
index 67ca27af5b8832329cc9b0ca9090b78fdd6671b2..8963c1527196c29a03af73f0e27033a12c1e0213 100644 (file)
--- 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 \