From 97c9b9cc3b64af599cb063d87fc95bf9b63c0464 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Fri, 29 Jul 2022 11:08:04 +0200 Subject: [PATCH] Don't enable RDP support in ELN/RHEL 9+ FreeRDP is built without server support in RHEL and ELN so we should disable the RDP there. Partial backport of a RHEL 9 change from https://gitlab.com/redhat/centos-stream/rpms/gnome-remote-desktop/-/commit/9a9f01d1 --- gnome-remote-desktop.spec | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/gnome-remote-desktop.spec b/gnome-remote-desktop.spec index 4c9f27e..a5b8100 100644 --- a/gnome-remote-desktop.spec +++ b/gnome-remote-desktop.spec @@ -2,9 +2,16 @@ %global tarball_version %%(echo %{version} | tr '~' '.') +# In RHEL/ELN FreeRDP is built without server support +%if 0%{?rhel} >= 9 +%global enable_rdp 0 +%else +%global enable_rdp 1 +%endif + Name: gnome-remote-desktop Version: 43~alpha -Release: 1%{?dist} +Release: 2%{?dist} Summary: GNOME Remote Desktop screen share service License: GPLv2+ @@ -21,8 +28,11 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(ffnvcodec) +%if 0%{?enable_rdp} BuildRequires: pkgconfig(freerdp2) BuildRequires: pkgconfig(fuse3) +BuildRequires: pkgconfig(winpr2) +%endif BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glib-2.0) >= 2.68 BuildRequires: pkgconfig(gio-unix-2.0) @@ -34,7 +44,6 @@ BuildRequires: pkgconfig(libpipewire-0.3) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libvncserver) >= 0.9.11-7 BuildRequires: pkgconfig(systemd) -BuildRequires: pkgconfig(winpr2) BuildRequires: pkgconfig(xkbcommon) Requires: pipewire%{?_isa} >= 0.3.0 @@ -52,7 +61,11 @@ GNOME desktop environment. %build %meson \ +%if 0%{?enable_rdp} -Drdp=true \ +%else + -Drdp=false \ +%endif -Dsystemd=true \ -Dvnc=true %meson_build @@ -84,11 +97,17 @@ GNOME desktop environment. %{_userunitdir}/%{systemd_unit} %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.desktop.remote-desktop.enums.xml +%if 0%{?enable_rdp} %{_datadir}/gnome-remote-desktop/ +%endif %{_mandir}/man1/grdctl.1* %changelog +* Fri Jul 29 2022 Tomas Popela - 43~alpha-2 +- FreeRDP is built without server support in RHEL and ELN so we should disable + the RDP there + * Thu Jul 28 2022 Jonas Ã…dahl - 43~alpha - Update to 43.alpha