diff --git a/SIGNATURES-2.0.5.txt b/SIGNATURES-2.0.5.txt deleted file mode 100644 index 54d443b..0000000 --- a/SIGNATURES-2.0.5.txt +++ /dev/null @@ -1,55 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -wireshark-2.0.5.tar.bz2: 31124989 bytes -SHA256(wireshark-2.0.5.tar.bz2)=0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b -RIPEMD160(wireshark-2.0.5.tar.bz2)=6b6755986c23fd195ddda9344d340a132439420c -SHA1(wireshark-2.0.5.tar.bz2)=ab77c632d8babf731bf0ecac0876fe3ff2923d04 -MD5(wireshark-2.0.5.tar.bz2)=627b5fc6cf0aeca196c75debd5e69b14 - -Wireshark-win32-2.0.5.exe: 43980792 bytes -SHA256(Wireshark-win32-2.0.5.exe)=6c382691dc1ab2da1c5efd02ab03c38babf30d39f31285fc55602ca6135ce593 -RIPEMD160(Wireshark-win32-2.0.5.exe)=df40554004d3ada5e8bcd35442abe5a7ff9cf401 -SHA1(Wireshark-win32-2.0.5.exe)=eb31d6492db724089667c2a4a7ab3fa18d075e0b -MD5(Wireshark-win32-2.0.5.exe)=cf50a5bc2872d97e43b89fe151e7d3be - -Wireshark-win64-2.0.5.exe: 47611856 bytes -SHA256(Wireshark-win64-2.0.5.exe)=e5f923ec8541dae548536bf9fd1505e344025240d677b7914ab8b0314f93d03c -RIPEMD160(Wireshark-win64-2.0.5.exe)=583e8b325bcc8472cb241a051314b3e1d41e7cff -SHA1(Wireshark-win64-2.0.5.exe)=2295d1d0643d1d33916036f574896924b640380e -MD5(Wireshark-win64-2.0.5.exe)=168626a41abca4e94021e46413ff772a - -WiresharkPortable_2.0.5.paf.exe: 43667584 bytes -SHA256(WiresharkPortable_2.0.5.paf.exe)=b9b11fda813ecdd8d7bb0a5a04ffd69c2a62ffa35e2ab558645db9096713f1af -RIPEMD160(WiresharkPortable_2.0.5.paf.exe)=b852a809cf6d3f428fde4e69bdedbbfe4981d3f3 -SHA1(WiresharkPortable_2.0.5.paf.exe)=ba09f8afc89e0466b0a43788b6b64b049da9ca16 -MD5(WiresharkPortable_2.0.5.paf.exe)=b14eb13faa7e9d420423fd8b5b09c608 - -Wireshark 2.0.5 Intel 32.dmg: 32422153 bytes -SHA256(Wireshark 2.0.5 Intel 32.dmg)=f07b50919586fb316be08e1f856d287da1495a35fc666387283cada71164b3b3 -RIPEMD160(Wireshark 2.0.5 Intel 32.dmg)=1b42ec3e04548801cb8a1acee2df157a3713a9d8 -SHA1(Wireshark 2.0.5 Intel 32.dmg)=9bdaaf2989c64b142731c083049824420d15c74e -MD5(Wireshark 2.0.5 Intel 32.dmg)=395c1d169d2be16d11b7ed17e47d398d - -Wireshark 2.0.5 Intel 64.dmg: 31692909 bytes -SHA256(Wireshark 2.0.5 Intel 64.dmg)=9fe81f0738fb718cb7340ab4f08094d84cc6343d0f299df4dd56f153483446a5 -RIPEMD160(Wireshark 2.0.5 Intel 64.dmg)=0cc849fd4aec3bd790c1ae7df4701bf96cc9c0da -SHA1(Wireshark 2.0.5 Intel 64.dmg)=9819a72b1bcee4e0879c350e7b0b5392664c765c -MD5(Wireshark 2.0.5 Intel 64.dmg)=4d3861437d9b0c3723d26cb3d350520d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAEBCgAGBQJXmRAqAAoJEIIkSnjm/q7qcMQP/jQ0X/7rtA1INZhb/eGm1gWI -FKKqvMGn2hQ5LluGyf9abR8UH7TDQbkNtfE8OKl2r6Kmr75xO+rib+WW8SgocHQt -OuyfdE6a6jwSBB/86tfYVY31qOsK2Z8r1rlzW0DfOC7Z73umfqiZum8AUtMVAfeq -xjAvKliRWNzK9Rukdy4gpXDPW5wWw2OCy8VRv6OZNTwrtlbvjQa/xW2Y1ku7VSKv -4GX2p5zpAdPocr9lenWkhyq4ZFCirt0K21tNh8WmPW0P27eKaWuRK9eycxOj7IIB -iGFR8Z/dHFVahZ1jQtTPCuyTYdEhgn+3N0WjBbP1LWdAaphnJsppoQWs2o5L9Ts/ -35reHRuA4zbf/n6hdY7Sm5DPlhaeQ077ExJIQFMlm3jnnBjswOfjQmq4JORpPODJ -JrgzNDDgEHd3eDx2T/XmCTK7JSfQYGeOKkZBBYQrl/m+nGLTlv/9BgyFpMhjJzJg -CYJOYZ7TIcmoOUSvP83+Z1p11vdg2GsnzwX3SEmWV4ianMt4U1MdarloCla3H9yG -k7P1WmLi/1HVMfwNFQYLSO5DLy8Y2spJWBrKKFNGg3tc8Bhd5HLJVk9D2BhJArY/ -SI9Z2timxltmQv1xbkrrxUJ0ijvm7BWgH9QqeFwKSoQd7fO8Vnp1OgNclsZqZASQ -7at3ACUdS9Oi6qBuQ90A -=kyvh ------END PGP SIGNATURE----- diff --git a/SIGNATURES-2.2.0.txt b/SIGNATURES-2.2.0.txt new file mode 100644 index 0000000..5ce2a46 --- /dev/null +++ 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----- diff --git a/wireshark-1.10.0-authors-pod2man.patch b/wireshark-1.10.0-authors-pod2man.patch index 0f430ba..11ac1af 100644 --- 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 { +--- wireshark-2.2.0.orig/AUTHORS ++++ wireshark-2.2.0/AUTHORS +@@ -3534,7 +3534,7 @@ Peter Hatina { Gtk3 Wireshark fixes } @@ -30,7 +30,7 @@ Index: wireshark-1.12.0/AUTHORS USBPcap support } -@@ -3662,7 +3662,7 @@ Cvetan Ivanov +@@ -3780,7 +3780,7 @@ Cvetan Ivanov Vasanth Manickam Julian Onions Samuel Thibault @@ -39,12 +39,14 @@ Index: wireshark-1.12.0/AUTHORS Paul Ollis Dominik Kuhlen Karl Knoebl -@@ -3753,7 +3753,7 @@ Paul Stath +@@ -3871,8 +3871,8 @@ Paul Stath DeCount - Andras Veres-Szentkiralyi + Andras Veres-Szentkiralyi Jakob Hirsch -Роман Донченко +-Роман Донченко +Roman Donchenko - ++Roman Donchenko Evan Huus Tom Cook + Tom Alexander diff --git a/wireshark-1.12.6-fix-QT-PIC-PIE.patch b/wireshark-1.12.6-fix-QT-PIC-PIE.patch deleted file mode 100644 index 035164e..0000000 --- a/wireshark-1.12.6-fix-QT-PIC-PIE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Andreas Stieger -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 diff --git a/wireshark-2.0.5.tar.bz2 b/wireshark-2.0.5.tar.bz2 deleted file mode 100644 index 5fb1c2f..0000000 --- a/wireshark-2.0.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b -size 31124989 diff --git a/wireshark-2.2.0.tar.bz2 b/wireshark-2.2.0.tar.bz2 new file mode 100644 index 0000000..05da180 --- /dev/null +++ b/wireshark-2.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6847e741efcba6cb9d92d464d4219917bee3ad0b8f5b0f80d4388ad2f3f1104 +size 32141141 diff --git a/wireshark-pkg-config.patch b/wireshark-pkg-config.patch deleted file mode 100644 index 7b8ead3..0000000 --- a/wireshark-pkg-config.patch +++ /dev/null @@ -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 diff --git a/wireshark.changes b/wireshark.changes index 2dc8e25..6b35794 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +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 + +- Wireshark 2.0.6: + This release fixes a number of issues that made it possible to + make Wireshark crash by injecting a malformed packet onto the + wire or by convincing someone to read a malformed packet trace + file. (bsc#998099) + * The QNX6 QNET dissector could crash + wnpa-sec-2016-50 CVE-2016-7175 + * The H.225 dissector could crash + wnpa-sec-2016-51 CVE-2016-7176 + * The Catapult DCT2000 dissector could crash + wnpa-sec-2016-52 CVE-2016-7177 + * The UMTS FP dissector could crash + wnpa-sec-2016-53 CVE-2016-7178 + * The Catapult DCT2000 dissector could crash + wnpa-sec-2016-54 CVE-2016-7179 + * The IPMI Trace dissector could crash + wnpa-sec-2016-55 CVE-2016-7180 + * Further bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-2.0.6.html + +------------------------------------------------------------------- +Mon Sep 5 14:49:45 UTC 2016 - astieger@suse.com + +- fix permissions warning on appdata, does not need +x + ------------------------------------------------------------------- Thu Jul 28 17:23:15 UTC 2016 - astieger@suse.com diff --git a/wireshark.spec b/wireshark.spec index 27202b9..180b0db 100644 --- 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.5 +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 @@ -263,13 +261,13 @@ install -d -m 0755 %{buildroot}%{_mandir}/man1/ # install separate appdata files corresponding to .desktop files for AppStore integration install -d -m0755 %{buildroot}%{_datadir}/appdata -install wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml +install -m644 wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml sed -i -e "//i \ \ \ \ Wireshark (GTK) Network Analyzer<\/name>" \ -e "//i \ \ \ \ GTK interface for wireshark network traffic analyzer<\/summary>" \ -e "s/wireshark\.desktop/wireshark-gtk.desktop/" \ %{buildroot}%{_datadir}/appdata/%{name}-gtk.appdata.xml -install wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -m644 wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml sed -i -e "//i \ \ \ \ Wireshark (QT) Network Analyzer<\/name>" \ -e "//i \ \ \ \ QT interface for wireshark network traffic analyzer<\/summary>" \ %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml @@ -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/