From 8dd95cd3f6fcd606e16e59f3b5fe16ab57643508 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Sun, 2 Aug 2020 22:24:49 -0500
Subject: [PATCH] Fix %ifarch usage

When rebuilding mariadb on EL7, I noticed that tokudb, mroonga, and
rocksdb were enabled, despite what this conditional appears to do.
After some experimentation, I can see that %ifarch does not support
appending another conditional with &&.  To achieve the desired logic,
the statement must be separate conditionals.
---
 mariadb.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mariadb.spec b/mariadb.spec
index ee3c20a..bfaa2a5 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -39,7 +39,8 @@
 #   https://mariadb.com/kb/en/library/about-myrocks-for-mariadb/
 #   RocksDB engine is available only for x86_64
 #   RocksDB may be built with jemalloc, if specified in CMake
-%ifarch x86_64 && 0%{?fedora}
+%ifarch x86_64
+%if 0%{?fedora}
 %bcond_without tokudb
 %bcond_without mroonga
 %bcond_without rocksdb
@@ -48,6 +49,7 @@
 %bcond_with mroonga
 %bcond_with rocksdb
 %endif
+%endif
 
 # The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
 # hierarchies and more complex graph structures to be handled in a relational fashion