rpms/avahi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

TigerVNC is going to be removed from RHEL 10

Browse Source 
Replace it with GNOME Connections in Remote Desktop Clients group

Resolves: RHEL-45257
This commit is contained in:
Tomas Popela 2024-06-27 10:03:47 +02:00 committed by Michal Sekletár
parent 48aeeefeb3
commit 60008cf9a6
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
avahi-0.8-no-vncviewer-c10s.patch Normal file
View File

@ -0,0 +1,41 @@
diff -up avahi-0.8/avahi-ui/bssh.c.vnc avahi-0.8/avahi-ui/bssh.c
--- avahi-0.8/avahi-ui/bssh.c.vnc 2024-06-27 09:18:51.742457490 +0200
+++ avahi-0.8/avahi-ui/bssh.c 2024-06-27 09:43:06.669594577 +0200
@@ -186,11 +186,14 @@ int main(int argc, char*argv[]) {
if (avahi_domain_equal(t, "_rfb._tcp")) {
char p[AVAHI_DOMAIN_NAME_MAX+16];
- snprintf(p, sizeof(p), "%s:%u", h, aui_service_dialog_get_port(AUI_SERVICE_DIALOG(d))-5900);
+ char p_prefixed[AVAHI_DOMAIN_NAME_MAX+22];
+ snprintf(p, sizeof(p), "%s:%u", h, aui_service_dialog_get_port(AUI_SERVICE_DIALOG(d))-5900);
+ snprintf(p_prefixed, sizeof(p_prefixed), "vnc://%s:%u", h, aui_service_dialog_get_port(AUI_SERVICE_DIALOG(d))-5900);
gtk_widget_destroy(d);
- g_print("vncviewer %s\n", p);
+ g_print("gnome-connections %s\n", p);
+ execlp("gnome-connections", "gnome-connections", p_prefixed, NULL);
execlp("xvncviewer", "xvncviewer", p, NULL);
execlp("vncviewer", "vncviewer", p, NULL);
diff -up avahi-0.8/man/bssh.1.xml.in.vnc avahi-0.8/man/bssh.1.xml.in
--- avahi-0.8/man/bssh.1.xml.in.vnc 2024-06-27 09:16:56.485135447 +0200
+++ avahi-0.8/man/bssh.1.xml.in 2024-06-27 09:18:35.817412999 +0200
@@ -32,7 +32,7 @@
<description>
<p>bssh/bvnc/bshell browses for SSH/VNC servers on the local
network, shows them in a GUI for the user to select one and
- finally calls ssh/vncviewer after a selection was made.</p>
+ finally calls ssh/GNOME Connections after a selection was made.</p>
<p>If the binary is called as bssh only ssh servers will be shown. If the binary is called as bvnc only VNC servers will be shown. If the binary is called as bshell both VNC and SSH servers are shown.</p>
@@ -76,7 +76,7 @@
<section name="See also">
<p>
- <manref name="avahi-browse" section="1"/>, <manref name="ssh" section="1"/>, <manref name="vncviewer" section="1"/>
+ <manref name="avahi-browse" section="1"/>, <manref name="ssh" section="1"/>
</p>
</section>

10
avahi.spec
View File

@ -58,7 +58,7 @@
Name: avahi
Version: 0.8
Release: 27%{?dist}
Release: 28%{?dist}
Summary: Local network service discovery
License: LGPL-2.1-or-later AND LGPL-2.0-or-later AND BSD-2-Clause-Views AND MIT
URL: http://avahi.org
@ -164,6 +164,7 @@ Patch100: avahi-0.6.30-mono-libdir.patch
# https://github.com/lathiat/avahi/pull/312
Patch101: 0016-fix-QT3-build.patch
Patch102: avahi-0.8-no_undefined.patch
Patch103: avahi-0.8-no-vncviewer-c10s.patch
%description
Avahi is a system which facilitates service discovery on
@ -188,7 +189,11 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Requires: %{name}-ui-gtk3%{?_isa} = %{version}-%{release}
%if 0%{?rhel} && 0%{?rhel} > 9
Requires: gnome-connections
%else
Requires: tigervnc
%endif
Requires: openssh-clients
%if %{WITH_PYTHON}
Requires: gdbm
@ -877,6 +882,9 @@ exit 0
%changelog
* Thu Jun 27 2024 Tomas Popela <tpopela@redhat.com> - 0.8-28
- TigerVNC won't be shipped in RHEL 10, prefer GNOME Connections instead
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.8-27
- Bump release for June 2024 mass rebuild