From d286cacc6587d5d47eb7f6a7afe3178abba1d8e2 Mon Sep 17 00:00:00 2001
From: John Eckersberg <jeckersb@redhat.com>
Date: Nov 21 2019 21:11:21 +0000
Subject: Erlang ver. 22.1.8


---

diff --git a/erlang.spec b/erlang.spec
index d9ced1d..3a62e98 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -65,7 +65,7 @@
 
 
 Name:		erlang
-Version:	22.1.7
+Version:	22.1.8
 Release:	1%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
@@ -83,9 +83,6 @@ Source8:	epmd@.socket
 Source998:	otp-make-subpackages.py
 Source999:	otp-get-patches.sh
 
-# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1770256 is resolved
-ExcludeArch: s390x
-
 # For the source of the Fedora specific patches, see the respective
 # branch at https://github.com/lemenkov/otp
 #
@@ -734,8 +731,15 @@ ERL_FLAGS="${RPM_OPT_FLAGS} -mcpu=ultrasparc -fno-strict-aliasing"
 ERL_FLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing"
 %endif
 
+# Kernel poll is buggy on s390x for unknown reasons, disable it
+# See rhbz#1770256
+%ifarch s390x
+%define __without_kernel_poll 1
+%endif
+
 CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib --enable-sctp --enable-systemd --disable-silent-rules \
 	%{?__with_hipe:--enable-hipe} \
+        %{?__without_kernel_poll:--disable-kernel-poll} \
 %if %{__with_java}
 	\
 %else
@@ -1939,6 +1943,10 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \
 
 
 %changelog
+* Thu Nov 21 2019 John Eckersberg <eck@redhat.com> - 22.1.8-1
+- Ver. 22.1.8
+- Re-enable s390x, but disable kernel polling, see rhbz#1770256
+
 * Mon Nov 11 2019 John Eckersberg <eck@redhat.com> - 22.1.7-1
 - Ver. 22.1.7
 - Add ExcludeArch for s390x, see rhbz#1770256
diff --git a/sources b/sources
index cd6a102..9f7d87a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (otp-OTP-22.1.7.tar.gz) = 72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05
+SHA512 (otp-OTP-22.1.8.tar.gz) = 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda