From 63c02cb8688860d9b6ae6d881d36b24582647d5044296c33ed406e32fc395b15 Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Thu, 5 Dec 2019 08:50:52 +0000 Subject: [PATCH] Accepting request 753276 from home:darix:branches:network:utilities - since we only have one gui package now move the gui related files to that package, which in turn reduces the requires in the main package for headless installations. OBS-URL: https://build.opensuse.org/request/show/753276 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=289 --- wireshark.changes | 7 +++++++ wireshark.spec | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/wireshark.changes b/wireshark.changes index e72c9e0..b53ca90 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 3 14:22:57 UTC 2019 - Marcus Rueckert + +- since we only have one gui package now move the gui related files + to that package, which in turn reduces the requires in the main + package for headless installations. + ------------------------------------------------------------------- Thu Oct 24 07:52:01 UTC 2019 - Robert Frohl diff --git a/wireshark.spec b/wireshark.spec index 1e79186..9b95681 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -62,7 +62,6 @@ BuildRequires: pkgconfig(libnghttp2) BuildRequires: pkgconfig(libssh) >= 0.6.0 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) -Requires: hicolor-icon-theme Requires(pre): permissions Requires(pre): shadow Recommends: wireshark-ui = %{version} @@ -150,6 +149,7 @@ from a live network or from a capture file on disk. Summary: A Network Traffic Analyser - Qt UI Group: Productivity/Networking/Diagnostic Requires: %{name} = %{version} +Requires: hicolor-icon-theme Provides: %{name}-ui = %{version} # gtk is the deprecated ui so ensure its uninstall Provides: %{name}-ui-gtk = %{version} @@ -256,10 +256,6 @@ exit 0 %verify(not mode caps) %attr(0750,root,wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap %{_libdir}/wireshark/ %{_datadir}/wireshark/ -%{_datadir}/icons/hicolor/*/apps/wireshark.png -%{_datadir}/icons/hicolor/*/mimetypes/application-wireshark-doc.png -%{_datadir}/icons/hicolor/scalable/apps/wireshark.svg -%{_datadir}/mime/packages/wireshark.xml %files -n %{libutil} %{_libdir}/libwsutil*.so.* @@ -286,6 +282,10 @@ exit 0 %{_datadir}/appdata/wireshark.appdata.xml %{_datadir}/applications/wireshark.desktop %{_datadir}/pixmaps/wireshark.png +%{_datadir}/icons/hicolor/*/apps/wireshark.png +%{_datadir}/icons/hicolor/*/mimetypes/application-wireshark-doc.png +%{_datadir}/icons/hicolor/scalable/apps/wireshark.svg +%{_datadir}/mime/packages/wireshark.xml %post ui-qt %desktop_database_post