aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2018-04-12 18:07:00 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-16 08:53:13 +0000
commit5594a9ba67473f4b9ca8d5e34e37e3134fa6362b (patch)
tree9b2c4428109c65a49144ce4c57b48a598fbc5f2c
parent63ee1a962e02bcf64123edae9e55b0723f83e3d7 (diff)
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 <a.broman58@gmail.com>
-rw-r--r--packaging/rpm/wireshark.spec.in4
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index 5f6d6ca..22f745b 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/*