From 069be53a63264c86b370e9becdcad6ea6bd48de7bd98aaf6a9a46029e14c519d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 24 Jul 2020 06:24:39 +0000
Subject: [PATCH] Accepting request 822555 from openSUSE:Factory:zSystems

use s390intrin.h instead of x86intrin.h on s390

OBS-URL: https://build.opensuse.org/request/show/822555
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-autobahn?expand=0&rev=37
---
 intrin-arch.patch       | 17 +++++++++++++++++
 python-autobahn.changes |  6 ++++++
 python-autobahn.spec    |  2 ++
 respect-cflags.patch    |  8 ++++----
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 intrin-arch.patch

diff --git a/intrin-arch.patch b/intrin-arch.patch
new file mode 100644
index 0000000..e8ede11
--- /dev/null
+++ b/intrin-arch.patch
@@ -0,0 +1,17 @@
+Index: autobahn-20.7.1/autobahn/nvx/_utf8validator.c
+===================================================================
+--- autobahn-20.7.1.orig/autobahn/nvx/_utf8validator.c
++++ autobahn-20.7.1/autobahn/nvx/_utf8validator.c
+@@ -27,8 +27,12 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ 
++#ifdef __s390__
++#include <s390intrin.h>
++#else
+ // http://stackoverflow.com/questions/11228855/header-files-for-simd-intrinsics
+ #include <x86intrin.h>
++#endif
+ 
+ 
+ #define UTF8_ACCEPT 0
diff --git a/python-autobahn.changes b/python-autobahn.changes
index a8a38f2..5a55f07 100644
--- a/python-autobahn.changes
+++ b/python-autobahn.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 23 14:42:38 UTC 2020 - Berthold Gunreben <azouhr@opensuse.org>
+
+- Add patch to include correct <arch>intrin.h for s390
+- Minor patch refresh for respect-cflags.patch
+
 -------------------------------------------------------------------
 Tue Jul 21 05:51:09 UTC 2020 - Steve Kowalik <steven.kowalik@suse.com>
 
diff --git a/python-autobahn.spec b/python-autobahn.spec
index d94ae6c..a032166 100644
--- a/python-autobahn.spec
+++ b/python-autobahn.spec
@@ -26,6 +26,7 @@ License:        MIT
 URL:            https://github.com/crossbario/autobahn-python
 Source:         https://files.pythonhosted.org/packages/source/a/autobahn/autobahn-%{version}.tar.gz
 Patch0:         respect-cflags.patch
+Patch1:         intrin-arch.patch
 BuildRequires:  %{python_module PyNaCl >= 1.0.1}
 BuildRequires:  %{python_module PyQRCode >= 1.1}
 BuildRequires:  %{python_module Twisted >= 20.3.0}
@@ -85,6 +86,7 @@ asynchronous Remote Procedure Calls and Publish & Subscribe on top of WebSocket.
 %prep
 %setup -q -n autobahn-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # this test relies too much on rng that can behave randomly in obs
 rm autobahn/test/test_rng.py
diff --git a/respect-cflags.patch b/respect-cflags.patch
index c0badf9..addf422 100644
--- a/respect-cflags.patch
+++ b/respect-cflags.patch
@@ -9,11 +9,11 @@ This could cause 'invalid instruction' faults on older user machines.
 
 https://bugzilla.opensuse.org/show_bug.cgi?id=1100677
 
-Index: autobahn-19.3.3/autobahn/nvx/_utf8validator.py
+Index: autobahn-20.7.1/autobahn/nvx/_utf8validator.py
 ===================================================================
---- autobahn-19.3.3.orig/autobahn/nvx/_utf8validator.py
-+++ autobahn-19.3.3/autobahn/nvx/_utf8validator.py
-@@ -52,7 +52,7 @@ with open(os.path.join(os.path.dirname(_
+--- autobahn-20.7.1.orig/autobahn/nvx/_utf8validator.py
++++ autobahn-20.7.1/autobahn/nvx/_utf8validator.py
+@@ -50,7 +50,7 @@ with open(os.path.join(os.path.dirname(_
          "_nvx_utf8validator",
          c_source,
          libraries=[],