From fb230be943ffcc5fadd5f33027b162717dddd9ea03aa1795f772042945f92254 Mon Sep 17 00:00:00 2001
From: James Oakley <jfunk@funktronics.ca>
Date: Mon, 14 Dec 2020 12:41:57 +0000
Subject: [PATCH] Accepting request 854990 from home:Andreas_Schwab:Factory

- Fix logic handling v8 plugin

OBS-URL: https://build.opensuse.org/request/show/854990
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=100
---
 uwsgi.changes |  5 +++++
 uwsgi.spec    | 11 ++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/uwsgi.changes b/uwsgi.changes
index d7ec1ba..ec32470 100644
--- a/uwsgi.changes
+++ b/uwsgi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec 11 22:29:58 UTC 2020 - Andreas Schwab <schwab@suse.de>
+
+- Fix logic handling v8 plugin
+
 -------------------------------------------------------------------
 Tue Dec  1 13:59:23 UTC 2020 - pgajdos@suse.com
 
diff --git a/uwsgi.spec b/uwsgi.spec
index 017577d..98dfd43 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -102,7 +102,7 @@ BuildRequires:  ruby19-devel
 BuildRequires:  sqlite3-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  pkgconfig(libsystemd)
-%ifarch %{ix86} x86_64 %{arm} aarch64
+%ifarch %{ix86} x86_64 %{arm}
 %if 0%{?suse_version} < 1310
 BuildRequires:  v8-devel
 %endif
@@ -386,9 +386,6 @@ uWSGI is a self-healing application container server coded in pure C.
 This package contains support for storing application configuration in SQLite3
 databases.
 
-
-%ifarch %{ix86} x86_64 %{arm} aarch64
-%if 0%{?suse_version} < 1310
 %package v8
 Summary:        V8 JavaScript Plugin for uWSGI
 Group:          Productivity/Networking/Web/Servers
@@ -398,8 +395,6 @@ Requires:       %{name} = %{version}
 uWSGI is a self-healing application container server coded in pure C.
 
 This package contains support for JavaScript using V8.
-%endif
-%endif
 
 %package xslt
 Summary:        XSLT Plugin for uWSGI
@@ -490,9 +485,11 @@ excluded_plugins="$excluded_plugins greenlet"
 
 # V8 is not yet available on all platforms and is broken in the v8 versions in
 # 13.1+
-%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64 ppc64le
 %if 0%{?suse_version} >= 1310
 excluded_plugins="$excluded_plugins v8"
+%else
+%ifnarch %{ix86} x86_64 %{arm}
+excluded_plugins="$excluded_plugins v8"
 %endif
 %endif