diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-11-12 14:17:03 -0500 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-11-16 14:31:21 +0000 |
| commit | fc51af45e65b534fa52c5519e23a7250ada195be (patch) | |
| tree | 6d2ed6633e74cf61f3ae722dc70473ae0dc8fd8a | |
| parent | 2773596970c362a6d81c7e44311781590074c43f (diff) | |
Don't include wireshark-gtk.desktop in RPMs.
The RPMs use 'alternatives' to determine which GUI is used so it doesn't make
sense to have 2 desktop entries: one for 'wireshark' (Qt or Gtk GUI, depending on
configuration) and one for 'wireshark-gtk' (the Gtk GUI).
(Maybe it makes sense to just not use 'alternatives' and allow the user to pick
which GUI is used via the menu system. But then if they wanted to run the Gtk+
GUI from the command line they'd need to remember to run 'wireshark-gtk' even
if that's the only GUI installed...)
Change-Id: I9d3fe13bb01eab87caad4ad21c6571ef6288b110
Reviewed-on: https://code.wireshark.org/review/11780
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index f4a121f08b..a6b9c84383 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -395,6 +395,10 @@ fi %{_libdir}/wireshark # Don't pick up the wireshark (GUI) man page %exclude %{_mandir}/man1/wireshark.* +# Our RPMs use 'alternatives' to choose the Wireshark so it doesn't make sense +# to have 2 desktop entries: one for 'wireshark' (Qt or Gtk GUI, depending on +# configuration) and one for 'wireshark-gtk' (the Gtk GUI). +%exclude %{_datadir}/applications/wireshark-gtk.desktop %{_mandir}/man1/* %{_mandir}/man4/* %{_datadir}/wireshark @@ -406,7 +410,6 @@ fi %files qt %defattr(-,root,root) %{_datadir}/applications/wireshark.desktop -%{_datadir}/applications/wireshark-gtk.desktop %{_datadir}/appdata/wireshark.appdata.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/mimetypes/* @@ -420,7 +423,6 @@ fi %files gtk %defattr(-,root,root) %{_datadir}/applications/wireshark.desktop -%{_datadir}/applications/wireshark-gtk.desktop %{_datadir}/appdata/wireshark.appdata.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/mimetypes/* |