The package rpms/xrdp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=9851eb23a1de4...
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=7e774ca02223b....
Change:
+ExcludeArch: s390x
-ExcludeArch: ppc64le s390x
Thanks.
Full change:
============
commit 9851eb23a1de4accd6113e680c8df7a73b9e6dda
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:36:47 2020 +1000
Exclude s390x arch for now, builds are failing strangely.
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 <releng(a)fedoraproject.org> -
1:0.9.13.1-3
- Second attempt - Rebuilt for
commit 7c2fbc794f0aff2870a441d05be0de51ddc5c75b
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:17:49 2020 +1000
Add patch for uninitialised return code (supposedly - only s390x).
diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch
new file mode 100644
index 0000000..ea95d3b
--- /dev/null
+++ b/xrdp-0.9.14-vnc-rc.patch
@@ -0,0 +1,12 @@
+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 4f2cd6e..bf3b084 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,6 +34,7 @@ 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
BuildRequires: gcc
BuildRequires: libX11-devel
commit 7e774ca02223b853a6ecf002496f922fe3fe0f9c
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:06:13 2020 +1000
Add patch to disable CPP warning when arch is not detected.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
new file mode 100644
index 0000000..c5ea0ca
--- /dev/null
+++ b/xrdp-0.9.14-arch.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
+--- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/common/arch.h 2020-08-31 22:03:28.387464109 +1000
+@@ -86,8 +86,6 @@
+ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
+ defined(__i386__) || defined(__aarch64__)
+ #define NO_NEED_ALIGN
+-#else
+-#warning unknown arch
+ #endif
+ #endif
+
diff --git a/xrdp.spec b/xrdp.spec
index 5a29349..4f2cd6e 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL:
http://www.xrdp.org/
Source0:
https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -33,10 +33,7 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
-
-%if 0%{?fedora} >= 34
-ExcludeArch: ppc64le s390x
-%endif
+Patch9: xrdp-0.9.14-arch.patch
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -282,8 +279,10 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
-* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-1
+* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-2
- 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
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:0.9.13.1-3
- Second attempt - Rebuilt for