From 5594a9ba67473f4b9ca8d5e34e37e3134fa6362b Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Thu, 12 Apr 2018 18:07:00 +0200 Subject: RPM: install wireshark.desktop in /usr/share/applications. The presence of this file in /usr/share/applications in required by suse_update_desktop_file, as described here: https://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file Change-Id: I88573afca2d4523a1b305bf4dc672c421c2fa1d1 Reviewed-on: https://code.wireshark.org/review/26925 Reviewed-by: Anders Broman --- packaging/rpm/wireshark.spec.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packaging/rpm') diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index 5f6d6ca483..22f745b614 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -315,6 +315,7 @@ cd - # SuSE's packaging conventions # (http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros#.25suse_update_desktop_file) # require this: +install -Dm 0644 %{buildroot}/usr/local/share/applications/wireshark.desktop %{buildroot}/usr/share/applications/wireshark.desktop %suse_update_desktop_file %{name} %else # Fedora's packaging guidelines (https://fedoraproject.org/wiki/Packaging:Guidelines) @@ -410,6 +411,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files qt %defattr(-,root,root) %{_datadir}/applications/wireshark.desktop +%if 0%{?suse_version} +/usr/share/applications/wireshark.desktop +%endif %{_datadir}/appdata/wireshark.appdata.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/mimetypes/* -- cgit v1.2.3