From 9851eb23a1de4accd6113e680c8df7a73b9e6dda Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Mon, 31 Aug 2020 22:36:47 +1000 Subject: [PATCH] Exclude s390x arch for now, builds are failing strangely. --- xrdp-0.9.14-vnc-rc.patch | 12 ------------ xrdp.spec | 4 +++- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 xrdp-0.9.14-vnc-rc.patch diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch deleted file mode 100644 index ea95d3b..0000000 --- a/xrdp-0.9.14-vnc-rc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c ---- xrdp-0.9.14-v/vnc/vnc.c 2020-08-26 12:32:22.000000000 +1000 -+++ xrdp-0.9.14/vnc/vnc.c 2020-08-31 22:17:02.664465069 +1000 -@@ -1423,7 +1423,7 @@ - { - int error; - struct vnc_screen_layout layout = {0}; -- int response_code; -+ int response_code = -1; - - error = find_matching_extended_rect(v, - rect_is_reply_to_us, diff --git a/xrdp.spec b/xrdp.spec index bf3b084..51f086a 100644 --- a/xrdp.spec +++ b/xrdp.spec @@ -34,7 +34,8 @@ Patch6: xrdp-0.9.14-log-snprintf.patch Patch7: xrdp-0.9.14-xfree86-evdev.patch Patch8: xrdp-0.9.14-fuse-pointer.patch Patch9: xrdp-0.9.14-arch.patch -Patch10: xrdp-0.9.14-vnc-rc.patch + +ExcludeArch: s390x BuildRequires: gcc BuildRequires: libX11-devel @@ -284,6 +285,7 @@ fi - Bump up to 0.9.14 - Add a set of patches to deal with new GCC warnings/errors - Do not emit warning on failed architecture detection +- Exclude s390x arch for now * Sat Aug 01 2020 Fedora Release Engineering - 1:0.9.13.1-3 - Second attempt - Rebuilt for