From 28286efbee236aeb5e11bc07d8e1c32e0141aaae93d2693f62569f47e5ad721d Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Wed, 12 Oct 2022 10:02:04 +0000 Subject: [PATCH] Accepting request 1010181 from home:rfrohl:branches:network:utilities wireshark 4.0.0: re-add lost changes OBS-URL: https://build.opensuse.org/request/show/1010181 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=380 --- wireshark.changes | 11 +++++++++++ wireshark.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/wireshark.changes b/wireshark.changes index 5670cbf..f70fbdc 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Oct 7 06:15:13 UTC 2022 - ecsos + +- Added an additional desktopfile to start wireshark which asks for + the super user password. + +------------------------------------------------------------------- +Thu Oct 6 15:48:15 UTC 2022 - ecsos + +- Fix build error for Leap. + ------------------------------------------------------------------- Wed Oct 5 15:01:15 UTC 2022 - Robert Frohl diff --git a/wireshark.spec b/wireshark.spec index 8bdcd88..84234e1 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -61,7 +61,7 @@ BuildRequires: libtool BuildRequires: lua51-devel BuildRequires: net-snmp-devel BuildRequires: openssl-devel -BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: pkgconfig BuildRequires: portaudio-devel BuildRequires: snappy-devel @@ -157,6 +157,7 @@ Summary: A Network Traffic Analyser - Qt UI Group: Productivity/Networking/Diagnostic Requires: %{name} = %{version} Requires: hicolor-icon-theme +Requires: xdg-utils Provides: %{name}-ui = %{version} # gtk is the deprecated ui so ensure its uninstall Provides: %{name}-ui-gtk = %{version} @@ -219,7 +220,13 @@ install -m 644 epan/dissectors/*.h "${IDIR}/epan/dissectors" install -m 644 wiretap/*.h "${IDIR}/wiretap" install -m 644 wsutil/*.h "${IDIR}/wsutil" +# desktop file +cp resources/freedesktop/%{org_name}.desktop %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop +sed -i -e 's|Name=Wireshark|Name=Wireshark - Super User Mode|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop +sed -i -e 's|Exec=wireshark %f|Exec=xdg-su -c wireshark %f|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop + %suse_update_desktop_file %{org_name} +%suse_update_desktop_file %{org_name}-su rm -f %{buildroot}%{_datadir}/doc/wireshark/*.html @@ -281,6 +288,7 @@ exit 0 %{_bindir}/wireshark %{_bindir}/ethereal %{_datadir}/applications/%{org_name}.desktop +%{_datadir}/applications/%{org_name}-su.desktop %{_datadir}/icons/hicolor/*/apps/%{org_name}.png %{_datadir}/icons/hicolor/*/mimetypes/%{org_name}-mimetype.png %{_datadir}/icons/hicolor/scalable/apps/%{org_name}.svg