rpm/wireshark
SHA256
1
0
Fork 0
forked from pool/wireshark
Code Pull Requests Activity

Accepting request 687393 from home:rfrohl:branches:network:utilities

Browse Source 
Wireshark 3.0.0

OBS-URL: https://build.opensuse.org/request/show/687393
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=271
This commit is contained in:
Robert Frohl 2019-03-21 15:49:40 +00:00 committed by Git OBS Bridge
parent 47563d0235
commit 424bd25dac
7 changed files with 105 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
SIGNATURES-2.6.7.txt
View File

@ -1,60 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-2.6.7.tar.xz: 28420060 bytes
SHA256(wireshark-2.6.7.tar.xz)=747b3e7a37414942959f76f198be49dcbcca936bda538c4408942ce71bfd2b71
RIPEMD160(wireshark-2.6.7.tar.xz)=4d27f7d67a9b8d11270c6fcf135eb5ad7648d462
SHA1(wireshark-2.6.7.tar.xz)=6d601a140b369618e5ac3acab736a1b8de8d5432
Wireshark-win64-2.6.7.exe: 60017936 bytes
SHA256(Wireshark-win64-2.6.7.exe)=ba016a14b9b99777dffd25f1a496395c4e662abb1ae8dcc252582e15cc11e20c
RIPEMD160(Wireshark-win64-2.6.7.exe)=2b86daf6cd3fea9aff87fdeaf812e2038600295e
SHA1(Wireshark-win64-2.6.7.exe)=6d08ec82f73672078b34560567ee35a2a3c80cd2
Wireshark-win32-2.6.7.exe: 54312360 bytes
SHA256(Wireshark-win32-2.6.7.exe)=efb0c94288f27ebdaf4ea7c051e399e80bcb97c4050786fa0156115861fe8ea3
RIPEMD160(Wireshark-win32-2.6.7.exe)=0b940d4978f1c04f5f18408f0ce19a2082947469
SHA1(Wireshark-win32-2.6.7.exe)=159716c4ee2969e673d1f13d1f00bfb3608b9343
Wireshark-win64-2.6.7.msi: 49393664 bytes
SHA256(Wireshark-win64-2.6.7.msi)=f527632f7f29bac6330f8847414f06ef79ecf6b2e40c37eb4c3c256c1421e719
RIPEMD160(Wireshark-win64-2.6.7.msi)=d0841ace2ac1e8ecb0c75c0113902f4c628e5ace
SHA1(Wireshark-win64-2.6.7.msi)=a76f4150f4520a5249f932d250221a13518e05be
Wireshark-win32-2.6.7.msi: 43745280 bytes
SHA256(Wireshark-win32-2.6.7.msi)=38eb93acb4128a83e9d62268d211cbc6c845df1b327a568872e910a3faf35c9b
RIPEMD160(Wireshark-win32-2.6.7.msi)=bf8d3ac103104b79535cf8a2f9f9b81265579028
SHA1(Wireshark-win32-2.6.7.msi)=32a4b5548049ec446b37fdfb87941e193e8fe2a0
WiresharkPortable_2.6.7.paf.exe: 37500928 bytes
SHA256(WiresharkPortable_2.6.7.paf.exe)=8bbae646957c9e8b7ea4d1764f048d19364cc89faefc37bb7db5328d48131921
RIPEMD160(WiresharkPortable_2.6.7.paf.exe)=86863bfc58ba710d90551b6acad05a5b51ca588c
SHA1(WiresharkPortable_2.6.7.paf.exe)=af950cccbfe5f29f9cc626343666d75f986c9e63
Wireshark 2.6.7 Intel 64.dmg: 108153377 bytes
SHA256(Wireshark 2.6.7 Intel 64.dmg)=609b51b54a566917e0b4e1a4f0e1e8f1161a178bcef6a6da4b99189288c0c0c2
RIPEMD160(Wireshark 2.6.7 Intel 64.dmg)=c3604626f81c269bba0179fbfa6db00d398e9d3a
SHA1(Wireshark 2.6.7 Intel 64.dmg)=87583c19c4507bf265348acc8f8a9fef556f6dac
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 Intel 64.dmg"
Other: openssl sha256 wireshark-x.y.z.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAlx26h0ACgkQgiRKeOb+
rurg2A/+MxIAfpRXIFvBnVeQ03miyaGaiJl6+Vw+7POquzludbyzsMNGJJK/BJmX
cMjlkRODzTYxSaGXXpPOUxykqTZgFK6lsfGZ0WAJmEIDfInsXEMTFPrCDw1+Yvqf
WXIO5UB4fOye0piGQo9oKgYuFFLY7NwJorkKKem2A9Hkoap0vmBYoG21ATO2zGNt
GafY6iPPB1sDTy2m1N+77k/aBT+Jj5TnW9sNPR9rG4DFYpRMPkjyF7hNmvB7Box5
trfKQTpnnm9DjhTeqhquH9+WD1p6d7CoDKC9YDe0xBZXqVhMUGMlcgmNUn3fmIUG
gA5boaEGVbabO3c0DG0FyjUfppK3rJ15iglhPD4mcOo2jerzC5FO+bf59JsYRPu2
UctXR+YUfcvhWQulLiT2bzldn2N2Vd7/0JhfSjDHVsJkKpQi8yaIzZ1dv+80Z6cF
WwIEbCV+aJSDBj6NZhhiY7PzizeAc+H6Os2dWIOVNCGDlACXoKt5dHFnOC0+W1uT
0qneqcBH4TQo5jxL3C/vLIaUAbSR3Q1R1Y0MNchRHujCqmuaMdm2y0ttWjPQs97d
AA5z8e8iOQXnlpdjY/2/8Q0h9p6EXnrCFbCHr0GZUnX3SnglZwR38Vgv1pef38yG
ZQYQPW5jrZeGn3UOK8cT0fzBvOdamUVccVviBV/kZYnaji/DytM=
=bkma
-----END PGP SIGNATURE-----

60
SIGNATURES-3.0.0.txt Normal file
View File

@ -0,0 +1,60 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-3.0.0.tar.xz: 30953760 bytes
SHA256(wireshark-3.0.0.tar.xz)=bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e
RIPEMD160(wireshark-3.0.0.tar.xz)=9211657dc9d58eae871547d90021c376bb52f761
SHA1(wireshark-3.0.0.tar.xz)=c254d850c81d85964aa23d60bb6fdb1373032490
Wireshark-win64-3.0.0.exe: 59480000 bytes
SHA256(Wireshark-win64-3.0.0.exe)=b5d30a9c0b2835a41e8132b1d9246a01ad6f1461a4de14fa3ccbdf4919c70eac
RIPEMD160(Wireshark-win64-3.0.0.exe)=fc02e84b6f663849dff60c0193e5d92e3f6e68ea
SHA1(Wireshark-win64-3.0.0.exe)=f6c1cf74f0d1731ebda5a37aa1d4aeb2bde47130
Wireshark-win32-3.0.0.exe: 54214200 bytes
SHA256(Wireshark-win32-3.0.0.exe)=ca59a35866b5837578070ae064bb099d7a50b81be6b86884679aa86ef08ea89f
RIPEMD160(Wireshark-win32-3.0.0.exe)=bc3581a64f65e7608686e0b1b7b34765b03f9fa9
SHA1(Wireshark-win32-3.0.0.exe)=394b5df8254cb65df28aaf0f8dd7e35e3aa38eba
Wireshark-win64-3.0.0.msi: 47312896 bytes
SHA256(Wireshark-win64-3.0.0.msi)=c8592db98b073ad475a792a9c673dd83753c0a7c877dddf609f94e29c4f9c5d5
RIPEMD160(Wireshark-win64-3.0.0.msi)=2b6ae77450a2c508300859aff1aef864ebcc8e25
SHA1(Wireshark-win64-3.0.0.msi)=e34fdd40338cf6ea19263a6380e46029a0128b7a
Wireshark-win32-3.0.0.msi: 42098688 bytes
SHA256(Wireshark-win32-3.0.0.msi)=c68a6d38da8198a591f339caaf56ffe9602dfe62b0de672e4ae2f665181efce4
RIPEMD160(Wireshark-win32-3.0.0.msi)=ec4f51e87955e763b5f958bcaf675845e87d5962
SHA1(Wireshark-win32-3.0.0.msi)=3efdd648b4f8a9ef9aaad693d748c8b40e04528c
WiresharkPortable_3.0.0.paf.exe: 35918120 bytes
SHA256(WiresharkPortable_3.0.0.paf.exe)=77e3e34fc8c48dc3d2f8211fd20b451e7f40eb80cf569537bb89ca35ff952f5f
RIPEMD160(WiresharkPortable_3.0.0.paf.exe)=4332548a5f9691fa398738b701b64b0527a913f0
SHA1(WiresharkPortable_3.0.0.paf.exe)=a1389cd9a496e7d74f620ea2753c1ef31ed64366
Wireshark 3.0.0 Intel 64.dmg: 86771944 bytes
SHA256(Wireshark 3.0.0 Intel 64.dmg)=4f7667b4ed52997726e1c25277b11582440ef46498f0680928780b9fe0535881
RIPEMD160(Wireshark 3.0.0 Intel 64.dmg)=cd151425d57b859866f2fa28cd287332c144f795
SHA1(Wireshark 3.0.0 Intel 64.dmg)=4d9a7d7dc72cafc50f0393bdbff535fcd5f3c33e
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 Intel 64.dmg"
Other: openssl sha256 wireshark-x.y.z.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAlx4MzwACgkQgiRKeOb+
ruoFVg/+O21+3kghQJIQeIZG5fLVlUE20NKL2HQhji9caGajZIBF3Y47fq3jiXDZ
G/30QQ97HoSksVhZ7DZh/yJq0KPG4Tc9xE9UU3BAMOUwaUlMSASBGwC0cTEpXY3o
c9HfITnlVLhgwY2Fl3G65CbXxCqwCFM5LseAX49EPXWP1pOJ+KxFObPI2ZVvbmHp
JS+Y9B4kSqHwpDsMcPElh2zia2g6DwHW8JOhdZBaoOIulpb95qaobJVSE+R3wlyi
uRjfnA8Kwm00TSVq/UgrKR9iPcodwolvyBq6V7FJQw/p4xwOJcNdAm4zoxZ82u+w
1GhKL3++FL1Xfw/Aq/3gVwq3KhaCajhSWZ042dwUW1KjEpwZUIl485Srxb21bxKf
rdYOQMzerH43gDarUyfnkwcX/Q7ueRZIMxDgxMAgivI/IkXSmFbKIObT3KyUvPim
ON0Y6LEmrWJo5Vfcc9pm1EY00imuRYffU9Z1HqsS34nm6uvSFl2Po8nfNuzRruCq
869Kbij9Drjo7gwVgEWZBAxuGsiDJRzf0uElvYmFvf26er3JJJ0olf37MIgjAmpc
P4NP9Q7fAlaYhtvoiISvxQGHybr1w6iuerdFEmXvqs+SITYo1oHUbtS9a78vIneQ
TM7Exh7HNz8Hl+Zpox3FP1YzwmnyV3vWLFm5dAq3b6zCV2tQA1Y=
=l72j
-----END PGP SIGNATURE-----

24
wireshark-1.10.0-enable_lua.patch
View File

@ -1,24 +0,0 @@
From: prusnak@opensuse.org
References: [bnc#650434]
Upstream: never
- fix lua error at startup (enable_lua.patch) [bnc#650434]
previously named wireshark-1.2.4-enable_lua.patch
---
epan/wslua/template-init.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: wireshark-1.10.0rc2/epan/wslua/template-init.lua
===================================================================
--- wireshark-1.10.0rc2.orig/epan/wslua/template-init.lua 2013-04-22 19:04:37.000000000 +0100
+++ wireshark-1.10.0rc2/epan/wslua/template-init.lua 2013-05-26 17:43:20.000000000 +0100
@@ -43,7 +43,7 @@ if running_superuser then
local disabled_lib = {}
setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } );
- dofile = function() error("dofile " .. hint) end
+-- dofile = function() error("dofile " .. hint) end
loadfile = function() error("loadfile " .. hint) end
loadlib = function() error("loadlib " .. hint) end
require = function() error("require " .. hint) end

3
wireshark-2.6.7.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:747b3e7a37414942959f76f198be49dcbcca936bda538c4408942ce71bfd2b71
size 28420060

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

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

26
wireshark.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Thu Mar 21 14:09:53 UTC 2019 - Robert Frohl <rfrohl@suse.com>
- Wireshark 3.0.0
* The IP map feature (the "Map" button in the "Endpoints" dialog) has been
added back in a modernized form.
* Initial support for using PKCS #11 tokens for RSA decryption in TLS. This
can be configured at Preferences, RSA Keys.
* Conversation timestamps are supported for UDP/UDP-Lite protocols.
* TShark now supports the -G elastic-mapping option which generates an
ElasticSearch mapping file.
* The Ethernet and IEEE 802.11 dissectors no longer validate the frame check
sequence (checksum) by default.
* The TCP dissector gained a new "Reassemble out-of-order segments"
preference to fix dissection and decryption issues in case TCP segments are
received out-of-order.
* Decryption support for the new WireGuard dissector.
* The BOOTP dissector has been renamed to DHCP. With the exception of
"bootp.dhcp", the old "bootp.*" display filter fields are still supported
but may be removed in a future release.
* The SSL dissector has been renamed to TLS. As with BOOTP the old "ssl.*"
display filter fields are supported but may be removed in a future release.
- Further features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-3.0.0.html
- removed wireshark-1.10.0-enable_lua.patch, because LUA is enabled by default.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 28 13:21:47 UTC 2019 - Robert Frohl <rfrohl@suse.com> Thu Feb 28 13:21:47 UTC 2019 - Robert Frohl <rfrohl@suse.com>

138
wireshark.spec
View File

@ -17,27 +17,17 @@
# define libraries # define libraries
%define libutil libwsutil9 %define libutil libwsutil10
%define libwire libwireshark10 %define libwire libwireshark12
%define libtap libwiretap8 %define libtap libwiretap9
%define libcodecs libwscodecs2 %define libcodecs libwscodecs2
# Enable new Qt gui on new releases and build old GTK2 gui on old releases
%if 0%{?suse_version} > 1140
%bcond_without gnutls
%bcond_without qt
%bcond_with gtk
%else
%bcond_with gnutls
%bcond_with qt
%bcond_without gtk
%endif
%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: 2.6.7 Version: 3.0.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
@ -46,15 +36,14 @@ URL: https://www.wireshark.org/
Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt
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
Patch4: wireshark-1.10.0-enable_lua.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: glib2-devel BuildRequires: glib2-devel >= 2.32
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: libcares-devel BuildRequires: libcares-devel
BuildRequires: libgcrypt-devel >= 1.4.2 BuildRequires: libgcrypt-devel >= 1.8.0
BuildRequires: libpcap-devel BuildRequires: libpcap-devel
BuildRequires: libsmi-devel BuildRequires: libsmi-devel
BuildRequires: libtool BuildRequires: libtool
@ -64,6 +53,7 @@ BuildRequires: pcre-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: portaudio-devel BuildRequires: portaudio-devel
BuildRequires: snappy-devel BuildRequires: snappy-devel
BuildRequires: systemd-devel
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -83,24 +73,17 @@ BuildRequires: pkgconfig(liblz4)
# in openSUSE Leap 42.3, lz4 was incorrectly packaged # in openSUSE Leap 42.3, lz4 was incorrectly packaged
BuildConflicts: pkgconfig(liblz4) = 124 BuildConflicts: pkgconfig(liblz4) = 124
%endif %endif
%if %{with gnutls} BuildRequires: libgnutls-devel >= 3.2
BuildRequires: libgnutls-devel >= 2.12.0
%endif
%if 0%{?suse_version} > 1310 %if 0%{?suse_version} > 1310
BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(libnl-3.0)
%endif %endif
%if %{with gtk} BuildRequires: libqt5-linguist-devel
BuildRequires: cairo-devel BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: gtk2-devel >= 2.12.0
%endif
%if %{with qt}
BuildRequires: libqt5-linguist
BuildRequires: pkgconfig(Qt5Core) >= 5.0.0
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
%endif
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
BuildRequires: lua51-devel BuildRequires: lua51-devel
%else %else
@ -162,18 +145,6 @@ Obsoletes: ethereal-devel < %{version}
Wireshark is a network protocol analyzer. It allows examining data Wireshark is a network protocol analyzer. It allows examining data
from a live network or from a capture file on disk. from a live network or from a capture file on disk.
%if %{with gtk}
%package ui-gtk
Summary: A Network Traffic Analyser - GTK+ UI
Group: Productivity/Networking/Diagnostic
Requires: %{name} = %{version}
Provides: %{name}-ui = %{version}
%description ui-gtk
This package contains the GTK+ UI of Wireshark.
%endif
%if %{with qt}
%package ui-qt %package ui-qt
Summary: A Network Traffic Analyser - Qt UI Summary: A Network Traffic Analyser - Qt UI
Group: Productivity/Networking/Diagnostic Group: Productivity/Networking/Diagnostic
@ -184,7 +155,6 @@ Obsoletes: %{name}-ui-gtk
%description ui-qt %description ui-qt
This package contains the Qt based UI for Wireshark. This package contains the Qt based UI for Wireshark.
%endif
%prep %prep
# The publisher doesn't sign the source tarball, but a signatures file containing multiple hashes. # The publisher doesn't sign the source tarball, but a signatures file containing multiple hashes.
@ -193,72 +163,29 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA1 | head -n1 | cut -d
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
%setup -q %setup -q
%patch4 -p1
sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark*.desktop sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark*.desktop
%build %build
export CFLAGS="%{optflags} -fPIC"
export CXXFLAGS="%{optflags} -fPIC"
export LDFLAGS="-pie"
%if %{with qt} %cmake
#XXX: buggy autoconf checks.. %cmake_build
export PATH="%{_libdir}/qt5/bin:$PATH"
%endif
%configure \
%if %{with gtk}
--with-gtk=2 \
%endif
%if %{with qt}
--with-qt=yes \
%else
--with-qt=no \
%endif
%if %{with gnutls}
--with-gnutls=yes \
%else
--with-gnutls=no \
%endif
--with-libssh=yes \
--with-maxminddb=yes \
--with-krb5=yes \
--with-c-ares=yes \
--with-snappy=yes \
%if %{with lz4}
--with-lz4=yes \
%endif
--with-zlib=yes \
--with-nghttp2=yes \
--with-pic=yes
make %{?_smp_mflags} V=1
%install %install
%make_install %cmake_install
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
# Ethereal support (remove when SLE-11 is out of scope # Ethereal support (remove when SLE-11 is out of scope
%if %{with gtk}
ln -fs wireshark-gtk %{buildroot}%{_bindir}/ethereal
%endif
%if %{with qt}
ln -fs wireshark %{buildroot}%{_bindir}/ethereal ln -fs wireshark %{buildroot}%{_bindir}/ethereal
%endif
ln -fs tshark %{buildroot}%{_bindir}/tethereal 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 separate appdata files corresponding to .desktop files for AppStore integration
%if %{with qt}
install -d -m0755 %{buildroot}%{_datadir}/appdata install -d -m0755 %{buildroot}%{_datadir}/appdata
install -m644 wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml install -m644 wireshark.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
sed -i -e "/<description>/i \ \ \ \ <name>Wireshark (QT) Network Analyzer<\/name>" \ sed -i -e "/<description>/i \ \ \ \ <name>Wireshark (QT) Network Analyzer<\/name>" \
-e "/<description>/i \ \ \ \ <summary>QT interface for wireshark network traffic analyzer<\/summary>" \ -e "/<description>/i \ \ \ \ <summary>QT interface for wireshark network traffic analyzer<\/summary>" \
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%else
rm -f %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%endif
# -devel # -devel
install -d -m 0755 %{buildroot}%{_includedir}/wireshark install -d -m 0755 %{buildroot}%{_includedir}/wireshark
@ -281,22 +208,11 @@ 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"
%if %{with gtk}
install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark-gtk.png
install -D -m 0644 wireshark-gtk.desktop %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop
%suse_update_desktop_file -n %{name}-gtk
%else
# sometimes the gtk.desktop gets autoinstalled by make_install
rm -f %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop
%endif
%if %{with qt}
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 wireshark.desktop %{buildroot}%{_datadir}/applications/wireshark.desktop
%suse_update_desktop_file %{name} %suse_update_desktop_file %{name}
%else
rm -f %{buildroot}%{_datadir}/applications/wireshark.desktop rm -f %{buildroot}%{_datadir}/doc/wireshark/*.html
%endif
%pre %pre
getent group wireshark >/dev/null || groupadd -r wireshark getent group wireshark >/dev/null || groupadd -r wireshark
@ -360,27 +276,6 @@ exit 0
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/pkgconfig/wireshark.pc %{_libdir}/pkgconfig/wireshark.pc
%if %{with gtk}
%files ui-gtk
%{_bindir}/wireshark-gtk
%{_bindir}/ethereal
%{_datadir}/applications/wireshark-gtk.desktop
%{_datadir}/pixmaps/wireshark-gtk.png
%post ui-gtk
test -f %{_bindir}/update-mime-database && %{_bindir}/update-mime-database %{_datadir}/mime > /dev/null || :
test -f %{_bindir}/update-desktop-database && %{_bindir}/update-desktop-database > /dev/null || :
test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || :
test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || :
%postun ui-gtk
test -f %{_bindir}/update-mime-database && %{_bindir}/update-mime-database %{_datadir}/mime > /dev/null || :
test -f %{_bindir}/update-desktop-database && %{_bindir}/update-desktop-database > /dev/null || :
test -f /sbin/conf.d/SuSEconfig.gtk2 && SuSEconfig --module gtk2 > /dev/null || :
test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || :
%endif
%if %{with qt}
%files ui-qt %files ui-qt
%{_bindir}/wireshark %{_bindir}/wireshark
%{_bindir}/ethereal %{_bindir}/ethereal
@ -396,6 +291,5 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
%postun ui-qt %postun ui-qt
%desktop_database_postun %desktop_database_postun
%icon_theme_cache_postun %icon_theme_cache_postun
%endif
%changelog %changelog