From 3b6cf36164e76f24f7e939419729247b77935c96db380c77b8f12da80f85ae8e Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Wed, 18 Apr 2018 07:10:52 +0000
Subject: [PATCH] Accepting request 597685 from
 home:Guillaume_G:branches:openSUSE:Factory:ARM

- Update redis-enable-bactrace-on-x86-and-ia64-only.patch to handle
  arm and rename it to redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch
- Add redis-disable_integration_logging.patch to disable logging test
  when backtrace is not enabled

OBS-URL: https://build.opensuse.org/request/show/597685
OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=110
---
 redis-disable_integration_logging.patch                | 10 ++++++++++
 ...is-enable-bactrace-on-x86-ia64-and_arm32_only.patch |  2 +-
 redis.changes                                          |  8 ++++++++
 redis.spec                                             |  8 +++++++-
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 redis-disable_integration_logging.patch
 rename redis-enable-bactrace-on-x86-and-ia64-only.patch => redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch (94%)

diff --git a/redis-disable_integration_logging.patch b/redis-disable_integration_logging.patch
new file mode 100644
index 0000000..1b65e8b
--- /dev/null
+++ b/redis-disable_integration_logging.patch
@@ -0,0 +1,10 @@
+--- tests/test_helper.tcl.orig	2018-04-17 18:04:29.778303392 +0200
++++ tests/test_helper.tcl	2018-04-17 18:04:46.688365379 +0200
+@@ -40,7 +40,6 @@ set ::all_tests {
+     integration/aof
+     integration/rdb
+     integration/convert-zipmap-hash-on-load
+-    integration/logging
+     integration/psync2
+     integration/psync2-reg
+     unit/pubsub
diff --git a/redis-enable-bactrace-on-x86-and-ia64-only.patch b/redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch
similarity index 94%
rename from redis-enable-bactrace-on-x86-and-ia64-only.patch
rename to redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch
index ce2cebb..88ee7e1 100644
--- a/redis-enable-bactrace-on-x86-and-ia64-only.patch
+++ b/redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch
@@ -6,7 +6,7 @@ Index: src/config.h
  
  /* Test for backtrace() */
  #if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__))
-+#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || defined (__arm__)
  #define HAVE_BACKTRACE 1
  #endif
 +#endif
diff --git a/redis.changes b/redis.changes
index ebcb227..0c2c513 100644
--- a/redis.changes
+++ b/redis.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr 17 16:13:17 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Update redis-enable-bactrace-on-x86-and-ia64-only.patch to handle 
+  arm and rename it to redis-enable-bactrace-on-x86-ia64-and_arm32_only.patch
+- Add redis-disable_integration_logging.patch to disable logging test 
+  when backtrace is not enabled
+
 -------------------------------------------------------------------
 Thu Apr 12 13:13:49 UTC 2018 - ilya@ilya.pp.ua
 
diff --git a/redis.spec b/redis.spec
index 4d3ebc9..372250a 100644
--- a/redis.spec
+++ b/redis.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org
 #
 
+
 %define _data_dir       %{_localstatedir}/lib/%{name}
 %define _log_dir        %{_localstatedir}/log/%{name}
 %define _conf_dir       %{_sysconfdir}/%{name}
@@ -36,7 +37,8 @@ Source6:        %{name}.sysctl
 Patch0:         %{name}-initscript.patch
 # PATCH-MISSING-TAG -- See https://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch1:         %{name}-conf.patch
-Patch2:         %{name}-enable-bactrace-on-x86-and-ia64-only.patch
+Patch2:         %{name}-enable-bactrace-on-x86-ia64-and_arm32_only.patch
+Patch3:         %{name}-disable_integration_logging.patch
 BuildRequires:  pkgconfig
 BuildRequires:  procps
 BuildRequires:  tcl
@@ -58,6 +60,10 @@ different kind of sorting abilities.
 %patch0
 %patch1
 %patch2
+%ifnarch %{ix86} x86_64 ia64 %{arm}
+# We have no backtrace, so disable logging test
+%patch3 -p0
+%endif
 
 %build
 make %{?_smp_mflags} CFLAGS="%{optflags}" V=1