- up to 2.0.1

diff --git a/wireshark-ac.patch b/wireshark-ac.patch
index 5976bc24409340d52ec15b9aa1a982f92745a74f..fbb2329aa5d9b54c5cbaf7d90f7de68fc43cfebc 100644 (file)
--- a/wireshark-ac.patch
+++ b/wireshark-ac.patch
@@ -1,6 +1,7 @@
---- wireshark-1.4.0rc1/acinclude.m4~   2010-06-29 13:18:13.710088062 +0200
-+++ wireshark-1.4.0rc1/acinclude.m4    2010-06-29 13:19:37.996897805 +0200
-@@ -338,7 +338,7 @@
+diff -ruN wireshark-2.0.1.orig/acinclude.m4 wireshark-2.0.1/acinclude.m4
+--- wireshark-2.0.1.orig/acinclude.m4  2015-12-29 22:49:18.000000000 +0100
++++ wireshark-2.0.1/acinclude.m4       2016-01-11 00:38:48.501985907 +0100
+@@ -389,7 +389,7 @@
            # work.
            #
            AC_MSG_CHECKING(for broken pcap-config)
@@ -9,16 +10,15 @@
  
            "-L "*)
              #
-@@ -361,7 +361,7 @@
-           # Found it, and it's usable; use it to get the include flags
+@@ -413,6 +413,7 @@
            # for libpcap.
            #
--          CPPFLAGS="$CPPFLAGS `\"$PCAP_CONFIG\" --cflags`"
+           CPPFLAGS="$CPPFLAGS `\"$PCAP_CONFIG\" --cflags`"
 +          CPPFLAGS="$CPPFLAGS `$PCAP_CONFIG --cflags`"
          else
            #
            # Didn't find it; we have to look for libpcap ourselves.
-@@ -433,9 +433,9 @@
+@@ -481,9 +482,9 @@
          # libraries libpcap needs.
          #
          if test x$enable_static = xyes; then
@@ -30,23 +30,3 @@
          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-desktop.patch b/wireshark-desktop.patch
index 72c9f442c71c12dde0ee067e257763c1c39f7de0..003ab0da29d5d2cd12a0c340827cfc085d15069f 100644 (file)
--- a/wireshark-desktop.patch
+++ b/wireshark-desktop.patch
@@ -1,14 +1,37 @@
---- wireshark-1.6.7/wireshark.desktop  2012-06-02 18:29:44.784985048 +0300
-+++ wireshark-1.6.7/wireshark.desktop  2012-06-02 18:30:27.236953001 +0300
-@@ -67,6 +67,8 @@
- Comment=Network traffic analyzer
- Comment[fi]=Verkkoliikenne analysaattori
- Comment[fr]=Analyseur de trafic réseau
-+Comment[ja]=The Wireshark ネットワーク・アナライザー
-+Comment[pl]=Wireshark - analizator ruchu w sieci
- Comment[sv]=Nätverkstrafikanalysator
- Icon=wireshark.png
- TryExec=wireshark
-@@ -78 +80 @@
--Categories=System;Monitor;GTK;
-+Categories=GTK;Network;
+--- wireshark-2.0.1/wireshark-gtk.desktop.orig 2015-12-29 22:49:24.000000000 +0100
++++ wireshark-2.0.1/wireshark-gtk.desktop      2016-01-11 21:09:07.263272866 +0100
+@@ -102,8 +102,8 @@
+ Comment[vi]=Trình phân tích giao thông mạng
+ Comment[uk]=Аналізатор мережевого трафіку
+ Icon=wireshark
+-TryExec=wireshark-gtk
+-Exec=wireshark-gtk %f
++TryExec=wireshark
++Exec=wireshark %f
+ Terminal=false
+ MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;
+ # Category entry according to:
+--- wireshark-2.0.1/wireshark.desktop.orig     2015-12-29 22:49:24.000000000 +0100
++++ wireshark-2.0.1/wireshark.desktop  2016-01-11 21:09:35.158155401 +0100
+@@ -5,8 +5,8 @@
+ Type=Application
+ # This is the version of the spec for this file, not the application version.
+ Version=1.0
+-Name=Wireshark
+-Name[vi]=Wireshark
++Name=Wireshark (Qt)
++Name[vi]=Wireshark (Qt)
+ GenericName=Network Analyzer
+ GenericName[af]=Netwerk Analiseerder
+ GenericName[az]=Şəbəkə Analiz Proqramı
+@@ -102,8 +102,8 @@
+ Comment[vi]=Trình phân tích giao thông mạng
+ Comment[uk]=Аналізатор мережевого трафіку
+ Icon=wireshark
+-TryExec=wireshark
+-Exec=wireshark %f
++TryExec=wireshark-qt
++Exec=wireshark-qt %f
+ Terminal=false
+ MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;
+ # Category entry according to:

diff --git a/wireshark-gcc43.patch b/wireshark-gcc43.patch
deleted file mode 100644 (file)
index 7458f82..0000000
--- a/wireshark-gcc43.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-apture-pcap-util.c:399: error: static declaration of 'pcap_datalink_name_to_val' follows non-static declaration
-/usr/include/pcap/pcap.h:313: note: previous declaration of 'pcap_datalink_name_to_val' was here
-capture-pcap-util.c:414: error: static declaration of 'pcap_datalink_val_to_name' follows non-static declaration
-/usr/include/pcap/pcap.h:314: note: previous declaration of 'pcap_datalink_val_to_name' was here
-
---- wireshark-1.2.0/capture-pcap-util.c~       2009-06-16 06:04:01.000000000 +0200
-+++ wireshark-1.2.0/capture-pcap-util.c        2009-06-23 01:28:10.162762368 +0200
-@@ -395,7 +395,7 @@
- };
- 
- #if !defined(HAVE_PCAP_DATALINK_NAME_TO_VAL)
--static int
-+int
- pcap_datalink_name_to_val(const char *name)
- {
-       int i;
-@@ -410,7 +410,7 @@
- #endif /* defined(HAVE_PCAP_DATALINK_NAME_TO_VAL) */
- 
- #if !defined(HAVE_PCAP_DATALINK_VAL_TO_NAME)
--static const char *
-+const char *
- pcap_datalink_val_to_name(int dlt)
- {
-       int i;

diff --git a/wireshark.spec b/wireshark.spec
index 8716304e885854038bff3f2fdf40880f3f4f7d42..6f3dd14c52a19ec01bc89ce50eab23f42be48290 100644 (file)
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -21,16 +21,15 @@ Summary(pt_BR.UTF-8):       Analisador de tráfego de rede
 Summary(ru.UTF-8):     Анализатор сетевого траффика
 Summary(uk.UTF-8):     Аналізатор мережевого трафіку
 Name:          wireshark
-Version:       1.12.7
+Version:       2.0.1
 Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2
-# Source0-md5: c8ae53f648b1dcbf6e74495401a0f1ab
+# Source0-md5: c1610ab2238965363b811e5188750fb1
 Patch0:                %{name}-Werror.patch
-Patch1:                %{name}-gcc43.patch
-Patch2:                %{name}-ac.patch
-Patch3:                %{name}-desktop.patch
+Patch1:                %{name}-ac.patch
+Patch2:                %{name}-desktop.patch
 URL:           http://www.wireshark.org/
 BuildRequires: GeoIP-devel
 BuildRequires: asciidoc
@@ -186,6 +185,7 @@ Wireshark - це аналізатор мережевого трафіку для
 Summary:       Qt-based network traffic and protocol analyzer
 Summary(pl.UTF-8):     Analizator ruchu i protokołów sieciowych oparty na Qt
 Group:         Networking
+Requires:      Qt5Gui-platform-xcb
 
 %description qt
 An initial port to Qt (aka QtShark).
@@ -259,7 +259,6 @@ pakietów.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 find -name Makefile.am | xargs sed -i -e 's/-Werror//g'
 
 %build
@@ -299,7 +298,9 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_includedir}/wiretap}
        DESTDIR=$RPM_BUILD_ROOT
 
 cp -p image/hi48-app-wireshark.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-cp -p wireshark.desktop $RPM_BUILD_ROOT%{_desktopdir}
+%{?with_qt:cp -p wireshark-gtk.desktop $RPM_BUILD_ROOT%{_desktopdir}/wireshark.desktop}
+%{?with_gtk3:cp -p wireshark.desktop $RPM_BUILD_ROOT%{_desktopdir}/wireshark-qt.desktop}
+%{__rm} -f $RPM_BUILD_ROOT%{_desktopdir}/wireshark-gtk.desktop
 
 cp -a wiretap/*.h $RPM_BUILD_ROOT%{_includedir}/wiretap
 
@@ -309,6 +310,9 @@ cp -a wiretap/*.h $RPM_BUILD_ROOT%{_includedir}/wiretap
 # no headers installed for this library
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libwireshark.{so,la}
 
+%{?with_qt:mv $RPM_BUILD_ROOT%{_bindir}/wireshark{,-qt}}
+%{?with_gtk3:mv $RPM_BUILD_ROOT%{_bindir}/wireshark{-gtk,}}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -318,6 +322,7 @@ rm -rf $RPM_BUILD_ROOT
 %post  common
 /sbin/ldconfig
 /sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' %{_bindir}/dumpcap
+%update_mime_database
 exit 0
 
 %postun        common
@@ -325,6 +330,7 @@ exit 0
 if [ "$1" = "0" ]; then
        %groupremove wireshark
 fi
+%update_mime_database
 
 %post  -n libwiretap -p /sbin/ldconfig
 %postun        -n libwiretap -p /sbin/ldconfig
@@ -334,8 +340,23 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/wireshark
 %{_datadir}/%{name}
-%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/*.desktop
 %{_pixmapsdir}/%{name}.png
+%{_iconsdir}/hicolor/16x16/apps/%{name}.png
+%{_iconsdir}/hicolor/16x16/mimetypes/application-%{name}-doc.png
+%{_iconsdir}/hicolor/24x24/apps/%{name}.png
+%{_iconsdir}/hicolor/24x24/mimetypes/application-%{name}-doc.png
+%{_iconsdir}/hicolor/32x32/apps/%{name}.png
+%{_iconsdir}/hicolor/32x32/mimetypes/application-%{name}-doc.png
+%{_iconsdir}/hicolor/48x48/apps/%{name}.png
+%{_iconsdir}/hicolor/48x48/mimetypes/application-%{name}-doc.png
+%{_iconsdir}/hicolor/64x64/apps/%{name}.png
+%{_iconsdir}/hicolor/64x64/mimetypes/application-%{name}-doc.png
+%{_iconsdir}/hicolor/128x128/apps/%{name}.png
+%{_iconsdir}/hicolor/128x128/mimetypes/application-%{name}-doc.png
+%{_iconsdir}/hicolor/256x256/apps/%{name}.png
+%{_iconsdir}/hicolor/256x256/mimetypes/application-%{name}-doc.png
+%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man1/wireshark.1*
 %endif
 
@@ -346,18 +367,22 @@ fi
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/plugins/%{version}*
 %attr(755,root,root) %{_libdir}/%{name}/plugins/%{version}*/*.so
+%attr(755,root,root) %{_bindir}/androiddump
 %attr(755,root,root) %{_bindir}/capinfos
 %attr(755,root,root) %{_bindir}/captype
 %attr(755,root,root) %{_bindir}/dftest
 %attr(750,root,wireshark) %{_bindir}/dumpcap
 %attr(755,root,root) %{_bindir}/editcap
+%attr(755,root,root) %{_bindir}/idl2wrs
 %attr(755,root,root) %{_bindir}/mergecap
 %attr(755,root,root) %{_bindir}/randpkt
 %attr(755,root,root) %{_bindir}/rawshark
 %attr(755,root,root) %{_bindir}/reordercap
 %attr(755,root,root) %{_bindir}/text2pcap
 %attr(755,root,root) %{_libdir}/libwireshark.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.5
+%attr(755,root,root) %ghost %{_libdir}/libwireshark.so.6
+%{_datadir}/appdata/wireshark.appdata.xml
+%{_datadir}/mime/packages/wireshark.xml
 %{_mandir}/man1/capinfos.1*
 %{_mandir}/man1/dftest.1*
 %{_mandir}/man1/dumpcap.1*
@@ -382,20 +407,16 @@ fi
 
 %files -n libwiretap
 %defattr(644,root,root,755)
-%doc wiretap/{README*,AUTHORS}
-%attr(755,root,root) %{_libdir}/libfiletap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfiletap.so.0
+%doc wiretap/README*
 %attr(755,root,root) %{_libdir}/libwiretap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwiretap.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwiretap.so.5
 %attr(755,root,root) %{_libdir}/libwsutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwsutil.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwsutil.so.6
 
 %files -n libwiretap-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libfiletap.so
 %attr(755,root,root) %{_libdir}/libwiretap.so
 %attr(755,root,root) %{_libdir}/libwsutil.so
-%{_libdir}/libfiletap.la
 %{_libdir}/libwiretap.la
 %{_libdir}/libwsutil.la
 %{_includedir}/wiretap