Accepting request 426839 from home:ecsos

update to 2.2.0 OBS-URL: https://build.opensuse.org/request/show/426839 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=185
2016-09-12 03:30:47 +00:00 · 2016-09-12 03:30:47 +00:00 · 857fe73224
commit 857fe73224
parent f85942a3fa
9 changed files with 89 additions and 194 deletions
--- a/SIGNATURES-2.0.6.txt
+++ b/SIGNATURES-2.0.6.txt
@ -1,55 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-wireshark-2.0.6.tar.bz2: 31213641 bytes
-SHA256(wireshark-2.0.6.tar.bz2)=70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db
-RIPEMD160(wireshark-2.0.6.tar.bz2)=ed2b0746094474226e5bda5947b7bd1ab5d6cde4
-SHA1(wireshark-2.0.6.tar.bz2)=5e10835f279fdbaa71a02d919e4c86f92592b82f
-MD5(wireshark-2.0.6.tar.bz2)=ffa419cd0d746f01d27e8fd326e23bea
-
-Wireshark-win32-2.0.6.exe: 43999168 bytes
-SHA256(Wireshark-win32-2.0.6.exe)=feb87cc760c613aea82cf2c0cc5e26552db34a6da893966b9b4b042bb146013d
-RIPEMD160(Wireshark-win32-2.0.6.exe)=70e87d16887345aa13ef77428d7ac4a2ccf9415b
-SHA1(Wireshark-win32-2.0.6.exe)=869d26a6576d7e07925c4f2ccfdee40cc57041f3
-MD5(Wireshark-win32-2.0.6.exe)=fe242954b61cf3263abdf747856afcb7
-
-Wireshark-win64-2.0.6.exe: 47639896 bytes
-SHA256(Wireshark-win64-2.0.6.exe)=8ec54cf8a75fa17e2adb2f77725c0694978236bb0cf4a288551f1263ef1a9f64
-RIPEMD160(Wireshark-win64-2.0.6.exe)=4d58dbc2fdd1296354dade21f6f1f1c3b20001d8
-SHA1(Wireshark-win64-2.0.6.exe)=633716106a41e7b2df7793fc4435a4fc27471c65
-MD5(Wireshark-win64-2.0.6.exe)=0ed8dc1549426d7d75eae36200c56f4f
-
-WiresharkPortable_2.0.6.paf.exe: 43674104 bytes
-SHA256(WiresharkPortable_2.0.6.paf.exe)=c0ce6198dc0b9da3dcaa07c42914aab49d1f6b05ebd245c65bc22f630f277cc8
-RIPEMD160(WiresharkPortable_2.0.6.paf.exe)=81fc931f35207e1fd174daa6f9788b3dfc8052d9
-SHA1(WiresharkPortable_2.0.6.paf.exe)=1eb402453252f3dae9904c861fe184f2f4ccbb7c
-MD5(WiresharkPortable_2.0.6.paf.exe)=114d39587adb8b9bb045e5d39a951181
-
-Wireshark 2.0.6 Intel 32.dmg: 32427735 bytes
-SHA256(Wireshark 2.0.6 Intel 32.dmg)=05f23e083d9fd51ed6c6e46ae5de7630db8992491e8539f35af58b949273a1fa
-RIPEMD160(Wireshark 2.0.6 Intel 32.dmg)=2a5690dc214d92329e7dd27213005f1f17c09c62
-SHA1(Wireshark 2.0.6 Intel 32.dmg)=3b1016dd62f4eeceaf872c6d71066f6de0fdeb4e
-MD5(Wireshark 2.0.6 Intel 32.dmg)=89208a3c680065b2cacd4d51fa9eec9e
-
-Wireshark 2.0.6 Intel 64.dmg: 31714967 bytes
-SHA256(Wireshark 2.0.6 Intel 64.dmg)=83aa0fdfc997562f482fb3d7737b1aa274ca1ce73895d7fdb4e935df6e001f96
-RIPEMD160(Wireshark 2.0.6 Intel 64.dmg)=fa9459c27052c84ea6477edb9b8ba0af2de4e9f0
-SHA1(Wireshark 2.0.6 Intel 64.dmg)=87a9c16771d8b1bbcd5fdd78a1c6527b613bad3e
-MD5(Wireshark 2.0.6 Intel 64.dmg)=24d901ead5c866860d464f05cea6610d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAEBCgAGBQJX0Z23AAoJEIIkSnjm/q7qzAEQALW4IGktfzXIcsNUN2TXpJx1
-gjzfwO0+oEsJHlt0/48SklFAsyYTQhmfA/m7NZbwS24FXpesVGXluVJwSVvKiGoy
-od9j4EwK3ASpuIHhHdMiwpvnW/G8HzZD6LfxltrotdGPA6axHgi6DFESybsQH6PP
-839Qbuq1bNzUGzu/C8jKalmek4XjU5XLWETV6Ph5MxZZh4C8zX5hkMmsxi34bNOk
-i3vv/O8NzXOTiwSvUEhabWbOl6CCa8K6Xv4eSKYUdq5YK988GzdA7o9WKEmzjU+l
-zNwGCGbOd9Bc1mEYM+wFXfD91cKto2TV82cRQLoKFcljs0ZEZ/wUD2rlOZ6JlaQ6
-uyfM8fg7eZSlJS7yMKJXp0Ooh5cLTz/DO7Niz5X27bCA7az/oxz/Z0QQtWFVl0dq
-qLV8cM8kZib9JrY7X1vasAjxYQg6+vrF8USfhWOyAVwRW/6jeQmz2us9z92wjtAT
-gva8XNePiHYgtZMigBXYadHLGOsTJBS/F9KDLhWyc9Fww3CmmsrDhML8DsS1USLn
-K0mTTvIw1eADYYmoYqjNMhF3FjfmzMJ7JdLZF7Cz9kbOjYV1GsIJlu15nHHtj2dL
-Yx59VDgRyepgcOnbU7lcrCWZIBY8/95UqOSSYu0xEgRu635did0dYDYIhf16igdo
-apFiixU+qtSpw6HGGjuK
-=NAH8
-----END PGP SIGNATURE-----
--- a/SIGNATURES-2.2.0.txt
+++ b/SIGNATURES-2.2.0.txt
@ -0,0 +1,49 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+wireshark-2.2.0.tar.bz2: 32141141 bytes
+SHA256(wireshark-2.2.0.tar.bz2)=a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104
+RIPEMD160(wireshark-2.2.0.tar.bz2)=bfcd77da458dc9f427cd423876a60968e8fa66ad
+SHA1(wireshark-2.2.0.tar.bz2)=4b47bf8e2053073585318646e27d2aa9dc7c7238
+MD5(wireshark-2.2.0.tar.bz2)=c7de0997f74934f25b456846cf75cb81
+
+Wireshark-win64-2.2.0.exe: 48513256 bytes
+SHA256(Wireshark-win64-2.2.0.exe)=439133f4cc5a71bffc0667a1a085c92a048a0cd82e6d1c5b8b6d0091a6593634
+RIPEMD160(Wireshark-win64-2.2.0.exe)=1cad997dea40a42ab5afe48d625ce2730adb9aa0
+SHA1(Wireshark-win64-2.2.0.exe)=5450d9b3ed6d3690327481c1a5c247e94a55b50e
+MD5(Wireshark-win64-2.2.0.exe)=0e3ab4a244754c762bbff4b298667ecb
+
+Wireshark-win32-2.2.0.exe: 44810232 bytes
+SHA256(Wireshark-win32-2.2.0.exe)=edec161d63255f06f4c89852749d7c33e931c6ed6f85fa8a0019795d6a5fff5b
+RIPEMD160(Wireshark-win32-2.2.0.exe)=010eec40b63b8e84db0aa7718e7df5afe338d65b
+SHA1(Wireshark-win32-2.2.0.exe)=d5ad9ca342449306486a4b31a0a889daca485cad
+MD5(Wireshark-win32-2.2.0.exe)=e533b9fcdf87f7ab5b4a89b66dcd68d1
+
+WiresharkPortable_2.2.0.paf.exe: 46448144 bytes
+SHA256(WiresharkPortable_2.2.0.paf.exe)=65d71783a8fe3b7ffe9769cbffcae1490123d7e663ddb44f1e997a01428e7fd4
+RIPEMD160(WiresharkPortable_2.2.0.paf.exe)=aeb87768fafd7dd5d4e96abf70fb9b694dd210a6
+SHA1(WiresharkPortable_2.2.0.paf.exe)=ea5694c45b755068f9d43d7d5e1df273e6c0d3e9
+MD5(WiresharkPortable_2.2.0.paf.exe)=a809f06f781501c46e70d6280f83ca75
+
+Wireshark 2.2.0 Intel 64.dmg: 32691388 bytes
+SHA256(Wireshark 2.2.0 Intel 64.dmg)=b74177a860e670bb147c8bb3fe4befffa743f39ca706067e8cdc297ff6222dca
+RIPEMD160(Wireshark 2.2.0 Intel 64.dmg)=60c4357bec88fac9e0606286bc83c34d6a76f9d8
+SHA1(Wireshark 2.2.0 Intel 64.dmg)=2653978bb55d8d1bed4041e286c0542a147cfaa5
+MD5(Wireshark 2.2.0 Intel 64.dmg)=a9ce381485da290d9a65d7e3499ad1db
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAEBCgAGBQJX0Fj9AAoJEIIkSnjm/q7q3NUQANEpZWBdtC2aCJnagAfi+URR
+mmSBxlfVY2oxDCZQ/77t9vbUIDK79tKd/gN1Hsj4dNoaLY9O20DB5iOOvl9T03H3
+pZx/TP16PbGGdMjYj0qAuHoHLcNJ7xBQ6BhXNhStewJcBQfN6bbz7bL5JGU4y0Ay
+ueofZeMgIbKbUo4vDR9Z+T7Uw6qCFH5IY7fucWu7ZP3/quA88WYLpuwiWuWnAmTo
+92ZpuogUyAq9C3EWHBdmKb3g2ikTgsNAiUBOr9g1rZvtyfefOwQ1Nqq+uL60iG5u
+kMK7BxjI1WVY7Yj92AN5Oi+6vwJP2NfKoKSJ6RtM56vLjGi52eEoJasg7T86Ifui
+N/5ba1ztTHk1isyDepQJPAnRM8ikuovTJw2EEkORlRquQLkshIeqown/7+C5elzP
+TA+82kDc9YqQlhE100ocYAcgYweYjhIeVzCwkGVzPXx0cTcmurEEr91BlYfvCCQh
+cxia1jZiqzRo3rFSamZA39p1DsZZCWPqpsuXKNxbVP2qPlSyKqG1eDN33riUHzaE
+CKohcoMj/blzL0VXFWznavAyR/Gfc6TozNifd6L0Kzzfx1J2RntIk/yET/XF0aC5
+Gw+QYgHZBOD/6h+ho8lodHORatUihNSI9PdnlgrSYpqcU+1FqA7Ka2GXXhTMIOlW
+vJ+6VyS7N1qKkT2o99zS
+=hTvw
+-----END PGP SIGNATURE-----
--- a/wireshark-1.10.0-authors-pod2man.patch
+++ b/wireshark-1.10.0-authors-pod2man.patch
@ -17,11 +17,11 @@ error: Bad exit status from /var/tmp/rpm-tmp.PtRL60 (%build)
 AUTHORS |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-Index: wireshark-1.12.0/AUTHORS
+Index: wireshark-2.2.0/AUTHORS
 ===================================================================
--- wireshark-1.12.0.orig/AUTHORS	2014-08-04 23:51:44.000000000 +0100
-+++ wireshark-1.12.0/AUTHORS	2014-08-04 23:53:31.000000000 +0100
-@@ -3520,7 +3520,7 @@ Peter Hatina		<phatina[AT]redhat.com> {
+--- wireshark-2.2.0.orig/AUTHORS
+++ wireshark-2.2.0/AUTHORS
+@@ -3534,7 +3534,7 @@ Peter Hatina		<phatina[AT]redhat.com> {
 	Gtk3 Wireshark fixes
 }
 
@ -30,7 +30,7 @@ Index: wireshark-1.12.0/AUTHORS
 	USBPcap support
 }
 
-@@ -3662,7 +3662,7 @@ Cvetan Ivanov		<zezo[AT]spnet.net>
+@@ -3780,7 +3780,7 @@ Cvetan Ivanov		<zezo[AT]spnet.net>
 Vasanth Manickam	<vasanth.manickam[AT]bt.com>
 Julian Onions		<julian.onions[AT]gmail.com>
 Samuel Thibault		<samuel.thibault[AT]ens-lyon.org>
@ -39,12 +39,14 @@ Index: wireshark-1.12.0/AUTHORS
 Paul Ollis		<paul.ollis[AT]roke.co.uk>
 Dominik Kuhlen		<dkuhlen[AT]gmx.net>
 Karl Knoebl		<karl.knoebl[AT]siemens.com>
-@@ -3753,7 +3753,7 @@ Paul Stath		<pstath[AT]axxcelera.com>
+@@ -3871,8 +3871,8 @@ Paul Stath		<pstath[AT]axxcelera.com>
 DeCount			<aatrade[AT]libero.it>
- Andras Veres-Szentkiralyi	<vsza[AT]vsza.hu>
+ Andras Veres-Szentkiralyi <vsza[AT]vsza.hu>
 Jakob Hirsch 		<jh.wireshark-bugzilla[AT]plonk.de>
 -Роман Донченко		<dpb[AT]corrigendum.ru>
+-Роман Донченко		<billyjeans[AT]gmail.com>
 +Roman Donchenko		<dpb[AT]corrigendum.ru>
- 			<billyjeans[AT]gmail.com>
+Roman Donchenko		<billyjeans[AT]gmail.com>
 Evan Huus		<eapache[AT]gmail.com>
 Tom Cook		<tcook[AT]ixiacom.com>
+ Tom Alexander		<talexander[AT]ixiacom.com>
--- a/wireshark-1.12.6-fix-QT-PIC-PIE.patch
+++ b/wireshark-1.12.6-fix-QT-PIC-PIE.patch
@ -1,47 +0,0 @@
-From: Andreas Stieger <astieger@suse.com>
-Date: Mon, 13 Jul 2015 11:30:56 +0200
-Subject: Compilation fails with qt5 5.4.1 and autotools due to lack of -fPIC
-References: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11230
-Upstream: not yet
-
-Workaround for compilation error on Factory:
-
-[ 1248s] In file included from /usr/include/qt5/QtGui/qwindowdefs.h:37:0,
-[ 1248s]                  from /usr/include/qt5/QtWidgets/qwidget.h:37,
-[ 1248s]                  from /usr/include/qt5/QtWidgets/qframe.h:37,
-[ 1248s]                  from /usr/include/qt5/QtWidgets/QFrame:1,
-[ 1248s]                  from accordion_frame.h:25,
-[ 1248s]                  from accordion_frame.cpp:26:
-[ 1248s] /usr/include/qt5/QtCore/qglobal.h:1052:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC (-fPIE is not enough)."
-[ 1248s]  #  error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
-[ 1248s]     ^
-
-Should be considered a temporary fix.
-Some discussion: https://build.opensuse.org/request/show/314996
-
-Index: wireshark-2.0.1/configure.ac
-===================================================================
--- wireshark-2.0.1.orig/configure.ac
-+++ wireshark-2.0.1/configure.ac
-@@ -1079,18 +1079,18 @@ AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-nee
- # in the address space to make attacks more difficult.
- #
- WS_CHECKED_CFLAGS_before_pie="$WS_CHECKED_CFLAGS"
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIE, C)
-+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIC, C)
- if test "x$can_add_to_cflags" = "xyes"
- then
- 	# Restore CFLAGS
- 	WS_CHECKED_CFLAGS="$WS_CHECKED_CFLAGS_before_pie"
- 
- 	LDFLAGS_before_pie="$LDFLAGS"
-	AC_WIRESHARK_LDFLAGS_CHECK([-fPIE -pie])
-+	AC_WIRESHARK_LDFLAGS_CHECK([-fPIC -pie])
- 	if test "x$LDFLAGS" != "x$LDFLAGS_before_pie"
- 	then
- 		# We can use PIE
-		PIE_CFLAGS="-fPIE"
-+		PIE_CFLAGS="-fPIC"
- 		PIE_LDFLAGS="-pie"
- 
- 		# Restore LDFLAGS
--- a/wireshark-2.0.6.tar.bz2
+++ b/wireshark-2.0.6.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70f3ac4fbe6d3b51abe602f34f21b527a6819ca5017f4d1b27f963fc52c298db
-size 31213641
--- a/wireshark-2.2.0.tar.bz2
+++ b/wireshark-2.2.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104
+size 32141141
--- a/wireshark-pkg-config.patch
+++ b/wireshark-pkg-config.patch
@ -1,60 +0,0 @@
---
- Makefile.am     |    4 ++++
- configure.ac    |    1 +
- wireshark.pc.in |   18 ++++++++----------
- 3 files changed, 13 insertions(+), 10 deletions(-)
-
-Index: wireshark-2.0.0rc1/Makefile.am
-===================================================================
--- wireshark-2.0.0rc1.orig/Makefile.am	2015-10-18 17:01:29.000000000 +0200
-+++ wireshark-2.0.0rc1/Makefile.am	2015-10-18 17:01:46.000000000 +0200
-@@ -55,6 +55,10 @@ EXTRA_PROGRAMS = wireshark-gtk wireshark
- dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
- 	smi_modules ipmap.html pdml2html.xsl
- 
-+# wireshark.pc is created by configure out of wireshark.pc.in
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = wireshark.pc
-+
- #
- # Install global profiles in the "profiles" subdirectory
- #
-Index: wireshark-2.0.0rc1/configure.ac
-===================================================================
--- wireshark-2.0.0rc1.orig/configure.ac	2015-10-18 17:01:29.000000000 +0200
-+++ wireshark-2.0.0rc1/configure.ac	2015-10-18 17:01:46.000000000 +0200
-@@ -3095,6 +3095,7 @@ AC_CONFIG_HEADERS(config.h)
- AC_OUTPUT(
-   Makefile
-   doxygen.cfg
-+  wireshark.pc
-   asn1/Makefile
-   _CUSTOM_ASN1_AC_OUTPUT_
-   asn1/acp133/Makefile
-Index: wireshark-2.0.0rc1/wireshark.pc.in
-===================================================================
--- wireshark-2.0.0rc1.orig/wireshark.pc.in	2015-10-18 17:01:46.000000000 +0200
-+++ wireshark-2.0.0rc1/wireshark.pc.in	2015-10-18 17:07:34.000000000 +0200
-@@ -1,14 +1,12 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=@ABSOLUTE_CMAKE_INSTALL_LIBDIR@
-sharedlibdir=${libdir}
-includedir=${prefix}/include/wireshark
-plugindir=@PLUGIN_INSTALL_DIR@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
- 
- Name: wireshark
- Description: wireshark network packet dissection library
-Version: @PROJECT_VERSION@
-+Version: @PACKAGE_VERSION@
- 
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lwireshark
-Cflags: -I${includedir}
-+Requires: glib-2.0 gmodule-2.0
-+Libs: -L${libdir} -lwireshark
-+Cflags: -I${includedir}/wireshark
--- a/wireshark.changes
+++ b/wireshark.changes
@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Sep  9 17:40:09 UTC 2016 - ecsos@opensuse.org
+
+- Wireshark 2.2.0:
+  * Bug fixes and updated protocol support as listed in:
+    https://www.wireshark.org/docs/relnotes/wireshark-2.2.0.html
+  * Drop wireshark-pkg-config.patch because code is now in upstream
+  * Drop wireshark-1.12.6-fix-QT-PIC-PIE.patch because no more need
+    for build. And create errors at build Tumbleweed.
+  * Rebase wireshark-1.10.0-authors-pod2man.patch
+
 -------------------------------------------------------------------
 Fri Sep  9 08:00:26 UTC 2016 - astieger@suse.com

--- a/wireshark.spec
+++ b/wireshark.spec
@ -29,7 +29,7 @@
 %define use_gnutls 0%{?suse_version} >= 1310 || 0%{?suse_version} == 1110

 Name:           wireshark
-Version:        2.0.6
+Version:        2.2.0
 Release:        0
 Summary:        A Network Traffic Analyser
 License:        GPL-2.0+ and GPL-3.0+
@ -44,8 +44,7 @@ Patch1:         wireshark-1.2.0-disable-warning-dialog.patch
 Patch2:         wireshark-1.2.0-geoip.patch
 Patch4:         wireshark-1.10.0-enable_lua.patch
 Patch5:         wireshark-1.10.0-authors-pod2man.patch
-Patch7:         wireshark-pkg-config.patch
-Patch8:         wireshark-1.12.6-fix-QT-PIC-PIE.patch
+
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  flex
@ -58,6 +57,7 @@ BuildRequires:  gtk2-devel >= 2.12.0
 %endif # with gtk
 %if %{with qt}
 %if 0%{?suse_version} > 1320
+BuildRequires:  libqt5-linguist
 BuildRequires:  pkgconfig(Qt5Core) >= 5.0.0
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Multimedia)
@ -201,16 +201,14 @@ sed \
 %endif # with gtk

 %patch5 -p1
-%patch7 -p1
-%patch8 -p1

 %build
 # for patch6 wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
 autoreconf -fiv

 # zlib-1.2.5 does not work well with wireshark, so disable it on pre-12.2
-export CFLAGS="%optflags -fPIC -fPIE"
-export CXXFLAGS="%optflags -fPIC -fPIE"
+export CFLAGS="%optflags -fPIC"
+export CXXFLAGS="%optflags -fPIC"
 export LDFLAGS="-pie"

 %if 0%{?suse_version} > 1320
@ -285,8 +283,7 @@ mkdir -p "${IDIR}/epan/dissectors"
 mkdir -p "${IDIR}/epan/wmem"
 mkdir -p "${IDIR}/wiretap"
 mkdir -p "${IDIR}/wsutil"
-install -m 644 color.h config.h register.h	"${IDIR}/"
-install -m 644 cfile.h file.h			"${IDIR}/"
+install -m 644 *.h                              "${IDIR}/"
 install -m 644 epan/*.h				"${IDIR}/epan/"
 install -m 644 epan/crypt/*.h			"${IDIR}/epan/crypt"
 install -m 644 epan/ftypes/*.h			"${IDIR}/epan/ftypes"
@ -295,7 +292,6 @@ install -m 644 epan/dissectors/*.h		"${IDIR}/epan/dissectors"
 install -m 644 epan/wmem/*.h			"${IDIR}/epan/wmem"
 install -m 644 wiretap/*.h			"${IDIR}/wiretap"
 install -m 644 wsutil/*.h			"${IDIR}/wsutil"
-install -m 644 ws_symbol_export.h			"${IDIR}/"

 %if %{with gtk}
 install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark-gtk.png
@ -331,25 +327,24 @@ getent group wireshark >/dev/null || groupadd wireshark
 %doc AUTHORS COPYING NEWS README README.linux README.vmware
 %doc %{_mandir}/man1/[^i]*
 %doc %{_mandir}/man4/*
-%{_bindir}/ethereal
-%{_bindir}/tethereal
-%{_bindir}/editcap
-%{_bindir}/tshark
-%{_bindir}/mergecap
-%{_bindir}/reordercap
-%{_bindir}/text2pcap
-%{_bindir}/dftest
 %{_bindir}/capinfos
 %{_bindir}/captype
-%{_bindir}/randpkt
-%{_bindir}/androiddump
+%{_bindir}/dftest
+%{_bindir}/editcap
+%{_bindir}/ethereal
 %{_bindir}/idl2wrs
+%{_bindir}/mergecap
+%{_bindir}/randpkt
+%{_bindir}/rawshark
+%{_bindir}/reordercap
+%{_bindir}/tethereal
+%{_bindir}/text2pcap
+%{_bindir}/tshark
 %if %{use_caps}
 %attr(0750,root,wireshark) %caps(cap_net_raw,cap_net_admin=eip) %{_bindir}/dumpcap
 %else
 %{_bindir}/dumpcap
 %endif
-%{_bindir}/rawshark
 %{_libdir}/lib*.so.*
 %{_libdir}/wireshark/
 %{_datadir}/wireshark/