pool/wireshark
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 941893 from network:utilities

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/941893
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=179
This commit is contained in:
Dominique Leuenberger 2021-12-22 19:17:53 +00:00 committed by Git OBS Bridge
commit a90111cdbe
7 changed files with 143 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wireshark-0001-dumpcap-permission-denied.patch
View File

@ -6,11 +6,11 @@ Date: Wed Jan 13 14:18:36 2021 +0100
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c
index f31914886a..d3baab6c50 100644 index f31914886a..d3baab6c50 100644
--- a/capchild/capture_sync.c --- a/capture/capture_sync.c
+++ b/capchild/capture_sync.c +++ b/capture/capture_sync.c
@@ -21,6 +21,10 @@ @@ -24,6 +24,10 @@
#include <wsutil/wslog.h>
#include <wsutil/strtoi.h> #include <wsutil/ws_assert.h>
+#include <sys/stat.h> +#include <sys/stat.h>
+#include <fcntl.h> +#include <fcntl.h>
@ -19,7 +19,7 @@ index f31914886a..d3baab6c50 100644
#ifdef _WIN32 #ifdef _WIN32
#include <wsutil/unicode-utils.h> #include <wsutil/unicode-utils.h>
#include <wsutil/win32-utils.h> #include <wsutil/win32-utils.h>
@@ -570,11 +574,22 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf @@ -592,11 +596,22 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf
* Child process - run dumpcap with the right arguments to make * Child process - run dumpcap with the right arguments to make
* it just capture with the specified capture parameters * it just capture with the specified capture parameters
*/ */
@ -44,7 +44,7 @@ index f31914886a..d3baab6c50 100644
sync_pipe_errmsg_to_parent(2, errmsg, ""); sync_pipe_errmsg_to_parent(2, errmsg, "");
/* Exit with "_exit()", so that we don't close the connection /* Exit with "_exit()", so that we don't close the connection
@@ -805,6 +820,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, @@ -827,6 +842,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd,
* Child process - run dumpcap with the right arguments to make * Child process - run dumpcap with the right arguments to make
* it just capture with the specified capture parameters * it just capture with the specified capture parameters
*/ */
@ -52,7 +52,7 @@ index f31914886a..d3baab6c50 100644
dup2(data_pipe[PIPE_WRITE], 1); dup2(data_pipe[PIPE_WRITE], 1);
ws_close(data_pipe[PIPE_READ]); ws_close(data_pipe[PIPE_READ]);
ws_close(data_pipe[PIPE_WRITE]); ws_close(data_pipe[PIPE_WRITE]);
@@ -812,8 +828,18 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, @@ -834,8 +850,18 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd,
ws_close(sync_pipe[PIPE_READ]); ws_close(sync_pipe[PIPE_READ]);
ws_close(sync_pipe[PIPE_WRITE]); ws_close(sync_pipe[PIPE_WRITE]);
execv(argv[0], argv); execv(argv[0], argv);

3
wireshark-3.4.10.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef
size 32344804

60
wireshark-3.4.10.tar.xz.asc
View File

@ -1,60 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-3.4.10.tar.xz: 32344804 bytes
SHA256(wireshark-3.4.10.tar.xz)=8aa7ef4a44ae62bb8db463cf761e2cc03b97305e0e77ed5be53fa83729187cef
RIPEMD160(wireshark-3.4.10.tar.xz)=eef58ec4e28c6eecc382c1f000257ab60ee6c40c
SHA1(wireshark-3.4.10.tar.xz)=63839abd94d3ae376f860e2d2969777680106578
Wireshark-win64-3.4.10.exe: 71382832 bytes
SHA256(Wireshark-win64-3.4.10.exe)=faa83ac4f289d07d8e1bacb7e7611758b231a9c00b18e816654f40e7437529fd
RIPEMD160(Wireshark-win64-3.4.10.exe)=63068a04839ff02828a6915fe648da25cdeadc84
SHA1(Wireshark-win64-3.4.10.exe)=00c419e3382d24289cfc9d74be6f37934b784066
Wireshark-win32-3.4.10.exe: 55424616 bytes
SHA256(Wireshark-win32-3.4.10.exe)=3bceac74d2d7c388e01b6c25b20088c234fefbcd83e3c960b3e0fcc1eca7839d
RIPEMD160(Wireshark-win32-3.4.10.exe)=84acc6b49f1e8735ec53127b1d9de14a1d121b2f
SHA1(Wireshark-win32-3.4.10.exe)=d6486f9015e60e633f0f2a7fd5152959c4bb749b
Wireshark-win64-3.4.10.msi: 49291264 bytes
SHA256(Wireshark-win64-3.4.10.msi)=b31288207b23700931ddb83785bcc9a9a775758029fbc1cdd653f65b8d802e7d
RIPEMD160(Wireshark-win64-3.4.10.msi)=d93a0cfebe7c2e412ade6e25c3a225b643d498e0
SHA1(Wireshark-win64-3.4.10.msi)=e36624c35824966255f768dc74148a7fe4a895d2
Wireshark-win32-3.4.10.msi: 43925504 bytes
SHA256(Wireshark-win32-3.4.10.msi)=6b6770e596968fdb0e68af3e3dba77631004f374accda085dc59df799011fa0f
RIPEMD160(Wireshark-win32-3.4.10.msi)=374b51b4934bd5d98023df4b8be355bf2c1515e9
SHA1(Wireshark-win32-3.4.10.msi)=df8a5c168bad317ff7b6ed1f12dec4926a2983f2
WiresharkPortable_3.4.10.paf.exe: 38220424 bytes
SHA256(WiresharkPortable_3.4.10.paf.exe)=85f2382b854be81ee7bc3deedaab41214e60e17a83c25822d4e5831c1d88e379
RIPEMD160(WiresharkPortable_3.4.10.paf.exe)=644f056554925fc37a44cfb247d0678efcb01c81
SHA1(WiresharkPortable_3.4.10.paf.exe)=8b36a16b9b602a1f5bb8cc37453fd1678e8fa476
Wireshark 3.4.10 Intel 64.dmg: 131298336 bytes
SHA256(Wireshark 3.4.10 Intel 64.dmg)=1267edf27870fe17e504f2377f78eb7510c4a13e4b53b9b00e171303208749c4
RIPEMD160(Wireshark 3.4.10 Intel 64.dmg)=880a76731ddaed630bfc575e36627cad1e239249
SHA1(Wireshark 3.4.10 Intel 64.dmg)=8783733e2f6f124c102b51f2e245d9deab11ff6d
You can validate these hashes using the following commands (among others):
Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256
Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz
macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg"
Other: openssl sha256 wireshark-x.y.z.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmGVXKYACgkQgiRKeOb+
rurDaQ//bZ7JSUS+v+eN1Te+TOBEmurQPc9oiY4/nQKa9vb4pKK3kP36zsUE59qT
hDCWWxijG4fgriFeMNKPJ9YErzEWyPkIEtXwyke2ubuIiNkRKhvSfz8BME49M9lD
ybPz/Rer2a/QS0+tU1LSd7NBArJdfxn3QtYbOLBkrqTSCH3eaxXQfKvM9mta10ZW
9YWxOVF8Lz4QqbolTb16ZgfcCI1XryOGs4W4Hd/YpaUnXvW6eYjIWs+KvCFQv/90
3nVjZbeMmW+lyLk1QhoLYo/wW+E80Cf8q5eCx/ohTauBIkcz2okpmB//UmYS4Ldv
YYyngLMIJpyZxry5YSg8lqBEwSOJh25cSxrKIdthzJMBFHAvtb7QKzGPPLBbvnnt
IBGq+u80/HqPRLdeBmbdS8e/YtHFSxTdLDb0wfNQ5p/Re/r9x35dFU/6Pafbr19E
s+FhEAcM66P7hECP91oDd6w3TuE9ZtdKzGNPUSezUSSn5D5FduLQ/lqGfnUV0qBm
ADi5tqoSkluGWfUefZ2KiUOlhQ4Lr82JaZbBnws8rY+krjRrGUxtnuwdKUTRNcTU
o5eWlVCvORvaKDJxaWw/3WoSpiP0dmio8XAz7gPxufyBcbw/xIQ+v53rmxIT7O6/
b97ZED+ZpU7kpYS8pnvTPPbj3nB4HHPpUkygHUvoUMxibFjOj2o=
=SVDw
-----END PGP SIGNATURE-----

3
wireshark-3.6.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9cc8f7fc5bb1d66fbdfdf95cde6e1c98633c303f9af9b33ae9f1fcf022fedf06
size 39687684

70
wireshark-3.6.0.tar.xz.asc Normal file
View File

@ -0,0 +1,70 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-3.6.0.tar.xz: 39687684 bytes
SHA256(wireshark-3.6.0.tar.xz)=9cc8f7fc5bb1d66fbdfdf95cde6e1c98633c303f9af9b33ae9f1fcf022fedf06
RIPEMD160(wireshark-3.6.0.tar.xz)=1ecec1acd1c10be69654afac3f4f2d0acaf42a3c
SHA1(wireshark-3.6.0.tar.xz)=98248f0e6c19408fbb796398f998cf90d7ed9ca6
Wireshark-win64-3.6.0.exe: 77270896 bytes
SHA256(Wireshark-win64-3.6.0.exe)=8ffa9f2c7943d1e8ed8020d7d08c8015ec649c3e3af901808a9ec858564cd255
RIPEMD160(Wireshark-win64-3.6.0.exe)=b9f85e1a331c04feb43548e7b69279a9c69dedb3
SHA1(Wireshark-win64-3.6.0.exe)=a847cd6fcc0764429601e7ab7967936d83f1a9f8
Wireshark-win32-3.6.0.exe: 61175712 bytes
SHA256(Wireshark-win32-3.6.0.exe)=798462bc710d4560e24ed408f2861efe22e9e4ea87d16271b192d7524239fd23
RIPEMD160(Wireshark-win32-3.6.0.exe)=3551defbcdb4c7a61d5ae37756c16d9f5299b071
SHA1(Wireshark-win32-3.6.0.exe)=a4b5097cec28938a9077c55f0ef30158c363d06c
Wireshark-win32-3.6.0.msi: 45277184 bytes
SHA256(Wireshark-win32-3.6.0.msi)=69e28782a4e8b901a6450215f9306b1c1b4aa818778a42af4f7820c267d57b85
RIPEMD160(Wireshark-win32-3.6.0.msi)=ce80145ba7ccebc46fde241184a57c3b4c988d07
SHA1(Wireshark-win32-3.6.0.msi)=6538c4a10effe314103d50b14d11e6d8728ed8dd
Wireshark-win64-3.6.0.msi: 50749440 bytes
SHA256(Wireshark-win64-3.6.0.msi)=d4f9fe9e907f91e272e48e4497f8ce18717bac65f8890bbfb925172617169758
RIPEMD160(Wireshark-win64-3.6.0.msi)=3b75bada21b4a116fa4e08681b440829135e99c2
SHA1(Wireshark-win64-3.6.0.msi)=eb369134cc7cdd7a9c205d71dc8852749c5a151d
WiresharkPortable32_3.6.0.paf.exe: 39317904 bytes
SHA256(WiresharkPortable32_3.6.0.paf.exe)=0dbeaa8d882dc50a839c5c33cea2cffce1f606d5ff38999d5186d1e89ac0ee0e
RIPEMD160(WiresharkPortable32_3.6.0.paf.exe)=f4686440dbdccb5372071b90c6adf990fd47353a
SHA1(WiresharkPortable32_3.6.0.paf.exe)=2451a05080f61c0d59221cb8431fa5bdf436ace1
WiresharkPortable64_3.6.0.paf.exe: 44098272 bytes
SHA256(WiresharkPortable64_3.6.0.paf.exe)=1b54a694ec2714a8744c19afa7bf15531ea6e0e9a71f91fc2d4ea42bccb8f392
RIPEMD160(WiresharkPortable64_3.6.0.paf.exe)=7840e70b98600c786efbb16845db9879202c394b
SHA1(WiresharkPortable64_3.6.0.paf.exe)=c2ce950aa36143cfe39043bce8cc112ed482a22f
Wireshark 3.6.0 Arm 64.dmg: 140005503 bytes
SHA256(Wireshark 3.6.0 Arm 64.dmg)=9893a985693c01b29b532745ca0f999590b119a3e8e9820a403291ffce11fd97
RIPEMD160(Wireshark 3.6.0 Arm 64.dmg)=5b21989294768b79cf312061ba1dd21884aed5e7
SHA1(Wireshark 3.6.0 Arm 64.dmg)=bf2ff02c32fb4b53688d8dcd8f081031cc631527
Wireshark 3.6.0 Intel 64.dmg: 138589061 bytes
SHA256(Wireshark 3.6.0 Intel 64.dmg)=c571417d3318074fbe73814a0180e84262e10b58cadb2e80c9fc05cf97e99645
RIPEMD160(Wireshark 3.6.0 Intel 64.dmg)=73a102fa432c9857cd20d280d2ac751cf2a81285
SHA1(Wireshark 3.6.0 Intel 64.dmg)=aeca14c89ede6fe358553d4889ed5888a6c6a200
You can validate these hashes using the following commands (among others):
Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256
Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz
macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg"
Other: openssl sha256 wireshark-x.y.z.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmGb7S8ACgkQgiRKeOb+
rurLoQ//W30fjYhihrUcgXo52bhdJEFujVRrmdS4PAUnmMspy4rnbvEZnKlji9nl
vUxCEzyrbrQHjKxUjkedNo4Najhp1R3NqULB8C0OPiHfEFOLWVGDdOuUzFSTk5rW
7XxxOiEV8D/1P4uv7xlAC2aXDZ4k2BPZ+vuz0+6wrtNiG6G87hysqiWkDErjS5h1
r61G70LnQ74xCdtBdB36NcGqydOKoRuaWurfXWEhVOASy5hpvNm+iTN7nqW+mEaD
9KIWHhPwjoVoc6G2RMtjDu72qLl4/0u0wiTYr2wCfjYJvmLezHB/GR0obNttLrhK
H1YSRgnz29Ko7lfbDdyJCj8iMCHwOf9n/8D+UMBd7v2/CnUrxa5ACnLccRvTLUVG
GUf/ggLxB6MzbIAN5PR/kwOxDJCBi6yoxO3AM+upcglsJ0VBAsDnkar7gXd6eOCf
duHHC9HTaReXzopEIf7CIal1Bduqnn439RNdiD8qn1tyZ905WhUoHaaH/LPRevh0
JaApvVyDxkSeTxfwOD3sIPT5Y5E2u5vXlWkKszp+fxKlEPZ2TknsuXEppMx5U6aq
2ZtB64ueMCE2/lBA9J+Yk4ebJSWyMtKuTso+qSbnc9zGkST7YKhAs1E7+xWv0dKs
Wv1n0PuTCZc+lMQdj+rzDug/047pD1fM6kF1WLHoHYZkimYMoS0=
=d/rn
-----END PGP SIGNATURE-----

48
wireshark.changes
View File

@ -1,3 +1,51 @@
-------------------------------------------------------------------
Tue Dec 20 12:45:39 UTC 2021 - Robert Frohl <rfrohl@suse.com>
- Wireshark 3.6.0:
* Several changes have been made to the display filter syntax:
- The expression "a != b" now always has the same meaning as
"!(a == b)". In particular this means filter expressions with
multi-value fields like "ip.addr != 1.1.1.1" will work as
expected (the result is the same as typing "ip.src != 1.1.1.1 and
ip.dst != 1.1.1.1"). This avoids the contradiction (a == b and a!= b)
being true.
- It is possible to use the syntax "a ~= b" or "a any_ne b" to
recover the previous (inconsistent with "==") logic for not equal.
- Literal strings can now be specified using raw string syntax,
identical to raw strings in the Python programming language. This
can be used to avoid the complexity of using two levels of
character escapes with regular expressions.
- Set elements must now be separated using a comma. A filter
such as http.request.method in {"GET" "HEAD"} must be written as ...
in {"GET", "HEAD"}. Whitespace is not significant. The
previous use of whitespace as separator is deprecated and will be
removed in a future version.
- Support for the syntax "a not in b" with the same meaning as
"not a in b" has been added.
* TCP conversations now support a completeness criteria, which
facilitates the identification of TCP streams having any of
opening or closing handshakes, a payload, in any combination. It
can be accessed with the new tcp.completeness filter.
* Protobuf fields that are not serialized on the wire or otherwise
missing in capture files can now be displayed with default values
by setting the new "add_default_value" preference. The default
values might be explicitly declared in "proto2" files, or false
for bools, first value for enums, zero for numeric types.
* Wireshark now supports reading Event Tracing for Windows (ETW). A
new extcap named ETW reader is created that now can open an etl
file, convert all events in the file to DLT_ETW packets and write
to a specified FIFO destination. Also, a new packet_etw dissector
is created to dissect DLT_ETW packets so Wireshark can display
the DLT_ETW packet header, its message and packet_etw dissector
calls packet_mbim sub_dissector if its provider matches the MBIM
provider GUID.
* "Follow DCCP stream" feature to filter for and extract the contents of DCCP streams.
* Wireshark now supports dissecting RTP packets with OPUS payloads.
- Further features, bug fixes and new and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-3.6.0.html
- updated patch to work with upstream changes
wireshark-0001-dumpcap-permission-denied.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 18 08:02:46 UTC 2021 - Paolo Stivanin <info@paolostivanin.com> Thu Nov 18 08:02:46 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>

35
wireshark.spec
View File

@ -18,16 +18,17 @@
# define libraries # define libraries
%define libcodecs libwscodecs2 %define libcodecs libwscodecs2
%define libtap libwiretap11 %define libtap libwiretap12
%define libutil libwsutil12 %define libutil libwsutil13
%define libwire libwireshark14 %define libwire libwireshark15
%define org_name org.wireshark.Wireshark
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%bcond_without lz4 %bcond_without lz4
%else %else
%bcond_with lz4 %bcond_with lz4
%endif %endif
Name: wireshark Name: wireshark
Version: 3.4.10 Version: 3.6.0
Release: 0 Release: 0
Summary: A Network Traffic Analyser Summary: A Network Traffic Analyser
License: GPL-2.0-or-later AND GPL-3.0-or-later License: GPL-2.0-or-later AND GPL-3.0-or-later
@ -37,6 +38,7 @@ Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt#/%{name}-%{version}.tar.xz.asc Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt#/%{name}-%{version}.tar.xz.asc
Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring
Patch10: wireshark-0001-dumpcap-permission-denied.patch Patch10: wireshark-0001-dumpcap-permission-denied.patch
BuildRequires: %{rb_default_ruby_suffix}-rubygem-asciidoctor
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: glib2-devel >= 2.32 BuildRequires: glib2-devel >= 2.32
@ -171,7 +173,6 @@ This package contains the Qt based UI for Wireshark.
echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut -d= -f2` %{SOURCE0}" | sha256sum -c echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut -d= -f2` %{SOURCE0}" | sha256sum -c
%autosetup -p1 %autosetup -p1
sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark*.desktop
%build %build
%cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/' %cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/'
@ -198,12 +199,6 @@ ln -fs tshark %{buildroot}%{_bindir}/tethereal
install -d -m 0755 %{buildroot}%{_sysconfdir} install -d -m 0755 %{buildroot}%{_sysconfdir}
install -d -m 0755 %{buildroot}%{_mandir}/man1/ 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 -m644 wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
sed -i -e "/<description>/i \ \ \ \ <name>Wireshark (QT) Network Analyzer<\/name>" \
-e "/<description>/i \ \ \ \ <summary>QT interface for wireshark network traffic analyzer<\/summary>" \
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
# -devel # -devel
install -d -m 0755 %{buildroot}%{_includedir}/wireshark install -d -m 0755 %{buildroot}%{_includedir}/wireshark
@ -223,13 +218,12 @@ install -m 644 epan/crypt/*.h "${IDIR}/epan/crypt"
install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes" install -m 644 epan/ftypes/*.h "${IDIR}/epan/ftypes"
install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter" install -m 644 epan/dfilter/*.h "${IDIR}/epan/dfilter"
install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" 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 wiretap/*.h "${IDIR}/wiretap"
install -m 644 wsutil/*.h "${IDIR}/wsutil" install -m 644 wsutil/*.h "${IDIR}/wsutil"
install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark.png install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark.png
install -D -m 0644 wireshark.desktop %{buildroot}%{_datadir}/applications/wireshark.desktop install -D -m 0644 %{org_name}.desktop %{buildroot}%{_datadir}/applications/%{org_name}.desktop
%suse_update_desktop_file %{name} %suse_update_desktop_file %{org_name}
rm -f %{buildroot}%{_datadir}/doc/wireshark/*.html rm -f %{buildroot}%{_datadir}/doc/wireshark/*.html
@ -290,14 +284,13 @@ exit 0
%files ui-qt %files ui-qt
%{_bindir}/wireshark %{_bindir}/wireshark
%{_bindir}/ethereal %{_bindir}/ethereal
%dir %{_datadir}/appdata %{_datadir}/applications/%{org_name}.desktop
%{_datadir}/appdata/wireshark.appdata.xml
%{_datadir}/applications/wireshark.desktop
%{_datadir}/pixmaps/wireshark.png %{_datadir}/pixmaps/wireshark.png
%{_datadir}/icons/hicolor/*/apps/wireshark.png %{_datadir}/icons/hicolor/*/apps/%{org_name}.png
%{_datadir}/icons/hicolor/*/mimetypes/application-wireshark-doc.png %{_datadir}/icons/hicolor/*/mimetypes/%{org_name}-mimetype.png
%{_datadir}/icons/hicolor/scalable/apps/wireshark.svg %{_datadir}/icons/hicolor/scalable/apps/%{org_name}.svg
%{_datadir}/mime/packages/wireshark.xml %{_datadir}/mime/packages/%{org_name}.xml
%{_datadir}/metainfo/%{org_name}.metainfo.xml
%post ui-qt %post ui-qt
%desktop_database_post %desktop_database_post