From df68a7f3a4cfe5336818e5b2f9d464a0cc3c4d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@redhat.com>
Date: Wed, 24 Nov 2021 10:18:30 +0100
Subject: [PATCH] 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
---
 gnome-remote-desktop.spec | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/gnome-remote-desktop.spec b/gnome-remote-desktop.spec
index 31d1317..2913277 100644
--- a/gnome-remote-desktop.spec
+++ b/gnome-remote-desktop.spec
@@ -4,14 +4,14 @@
 
 %if 0%{?rhel} >= 9
 %global bundle_libvncserver 1
-%global libvncserver_name LibVNCServer
-%global libvncserver_version 0.9.13
 %global enable_rdp 0
 %else
 %global bundle_libvncserver 0
 %global enable_rdp 1
 %endif
 
+%global libvncserver_name LibVNCServer
+%global libvncserver_version 0.9.13
 
 Name:           gnome-remote-desktop
 Version:        40.0
@@ -21,9 +21,7 @@ Summary:        GNOME Remote Desktop screen share service
 License:        GPLv2+
 URL:            https://gitlab.gnome.org/jadahl/gnome-remote-desktop
 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
-%endif
 
 ### gnome-remote-desktop patches
 # Adds encryption support (requires patched LibVNCServer)
@@ -32,11 +30,9 @@ Patch0:         gnutls-anontls.patch
 # Backport upstream leak fix (rhbz#1951129)
 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
-%endif
 
-%if 0%{?bundle_libvncserver}
 ### LibVNCServer patches
 ## TLS security type enablement patches
 # 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
 Patch2100: 0001-crypto-Don-t-compile-SHA1-support-when-Websockets-ar.patch
-%endif
 
 
 BuildRequires:  git