public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Peter Lemenkov <lemenkov@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/wireshark] f44: Drop the desktop-file path patch, whose reason no longer holds
Date: Tue, 22 Sep 2026 19:27:52 GMT [thread overview]
Message-ID: <179010527201.1.16951184504585646824.rpms-wireshark-9b43c179e8fa@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/wireshark
Branch : f44
Commit : 9b43c179e8fac8c4e138c96106a4b7a70f454faa
Author : Peter Lemenkov <lemenkov@gmail.com>
Date : 2026-09-08T21:45:00+02:00
Stats : +0/-22 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/wireshark/c/9b43c179e8fac8c4e138c96106a4b7a70f454faa?branch=f44
Log:
Drop the desktop-file path patch, whose reason no longer holds
The patch rewrote TryExec and Exec in the desktop file to absolute
paths. It was added for rhbz #1059188: Nautilus refused to open pcap
files, reporting "There is no application installed for 'Packet Capture
(PCAPNG)' files", because Wireshark was installed in /usr/sbin, which
is not on an ordinary user's PATH. A TryExec that cannot be resolved
lets the entry be ignored, so the association disappeared. Naming the
binary in full was the right fix for a binary that is not on PATH.
Wireshark is in /usr/bin now, and /usr/sbin is a symlink to bin, so
"wireshark" resolves for any user and the entry works as upstream
ships it.
Keeping the absolute path is not free. It makes the menu entry disagree
with the shell: a build in ~/.local/bin is what "wireshark" runs in a
terminal, but the desktop entry would still start /usr/bin/wireshark.
It is also the minority form here - of the desktop files installed on a
Fedora system, roughly four in five name the program without a path,
and those that do use one are mostly /usr/libexec programs, which is
the same "not on PATH" reason that has now gone away.
A build installed under ~/.local is unaffected either way, since it
installs its own desktop file into ~/.local/share/applications, which
is searched ahead of /usr/share/applications.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
diff --git a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch b/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
deleted file mode 100644
index 325afe2..0000000
--- a/wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Kenneth Soerensen <knnthsrnsn@gmail.com>
-Date: Wed, 29 Jan 2014 16:04:12 +0400
-Subject: [PATCH] Fix paths in a org.wireshark.Wireshark.desktop file
-
-
-diff --git a/resources/freedesktop/org.wireshark.Wireshark.desktop b/resources/freedesktop/org.wireshark.Wireshark.desktop
-index a880a50a33..54b3595d55 100644
---- a/resources/freedesktop/org.wireshark.Wireshark.desktop
-+++ b/resources/freedesktop/org.wireshark.Wireshark.desktop
-@@ -102,8 +102,8 @@ Comment[tr]=Ağ trafiği çözümleyicisi
- Comment[vi]=Trình phân tích giao thông mạng
- Comment[uk]=Аналізатор мережевого трафіку
- Icon=org.wireshark.Wireshark
--TryExec=wireshark
--Exec=wireshark %f
-+TryExec=/usr/bin/wireshark
-+Exec=/usr/bin/wireshark %f
- Terminal=false
- MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;application/x-micropross-mplog;application/x-apple-packetlogger;application/x-endace-erf;application/ipfix;application/x-ixia-vwr;
- # Category entry according to:
diff --git a/wireshark.spec b/wireshark.spec
index 0f29581..7569741 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -22,8 +22,6 @@ Source3: wireshark.sysusers
# Fedora-specific
Patch2: wireshark-0002-Customize-permission-denied-error.patch
# Fedora-specific
-Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch
-# Fedora-specific
Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch
# Proposed upstream - https://gitlab.com/wireshark/wireshark/-/merge_requests/26425
Patch9: wireshark-0009-remove-strato-manpages.patch
reply other threads:[~2026-09-22 19:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179010527201.1.16951184504585646824.rpms-wireshark-9b43c179e8fa@fedoraproject.org \
--to=lemenkov@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox