Always list bundled sources and patches

They'll only be used on rhel builds, but rpm cannot have conditional
sources, so always list them.

Related: #1936594
This commit is contained in:
Jonas Ådahl 2021-11-24 10:18:30 +01:00
parent 0c27eb1144
commit df68a7f3a4

View File

@ -4,14 +4,14 @@
%if 0%{?rhel} >= 9 %if 0%{?rhel} >= 9
%global bundle_libvncserver 1 %global bundle_libvncserver 1
%global libvncserver_name LibVNCServer
%global libvncserver_version 0.9.13
%global enable_rdp 0 %global enable_rdp 0
%else %else
%global bundle_libvncserver 0 %global bundle_libvncserver 0
%global enable_rdp 1 %global enable_rdp 1
%endif %endif
%global libvncserver_name LibVNCServer
%global libvncserver_version 0.9.13
Name: gnome-remote-desktop Name: gnome-remote-desktop
Version: 40.0 Version: 40.0
@ -21,9 +21,7 @@ Summary: GNOME Remote Desktop screen share service
License: GPLv2+ License: GPLv2+
URL: https://gitlab.gnome.org/jadahl/gnome-remote-desktop URL: https://gitlab.gnome.org/jadahl/gnome-remote-desktop
Source0: https://download.gnome.org/sources/gnome-remote-desktop/40/%{name}-%{tarball_version}.tar.xz Source0: https://download.gnome.org/sources/gnome-remote-desktop/40/%{name}-%{tarball_version}.tar.xz
%if 0%{?bundle_libvncserver}
Source1: https://github.com/LibVNC/libvncserver/archive/refs/tags/%{libvncserver_name}-%{libvncserver_version}.tar.gz Source1: https://github.com/LibVNC/libvncserver/archive/refs/tags/%{libvncserver_name}-%{libvncserver_version}.tar.gz
%endif
### gnome-remote-desktop patches ### gnome-remote-desktop patches
# Adds encryption support (requires patched LibVNCServer) # Adds encryption support (requires patched LibVNCServer)
@ -32,11 +30,9 @@ Patch0: gnutls-anontls.patch
# Backport upstream leak fix (rhbz#1951129) # Backport upstream leak fix (rhbz#1951129)
Patch1: 0001-pipewire-stream-Don-t-leak-GSource-s.patch Patch1: 0001-pipewire-stream-Don-t-leak-GSource-s.patch
%if 0%{?bundle_libvncserver} ## LibVNCServer patches required for bundling
Patch100: 0001-build-Set-rpath-on-executable.patch Patch100: 0001-build-Set-rpath-on-executable.patch
%endif
%if 0%{?bundle_libvncserver}
### LibVNCServer patches ### LibVNCServer patches
## TLS security type enablement patches ## TLS security type enablement patches
# https://github.com/LibVNC/libvncserver/pull/234 # https://github.com/LibVNC/libvncserver/pull/234
@ -58,7 +54,6 @@ Patch2000: libvncserver-LibVNCServer-0.9.13-system-crypto-policy.patch
## Don't compile SHA1 support ## Don't compile SHA1 support
Patch2100: 0001-crypto-Don-t-compile-SHA1-support-when-Websockets-ar.patch Patch2100: 0001-crypto-Don-t-compile-SHA1-support-when-Websockets-ar.patch
%endif
BuildRequires: git BuildRequires: git