From 601e598d2152d49249a38903545846fbf507d1a53fcbbceaa84d28ba7bcb5cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.com>
Date: Fri, 10 Apr 2015 15:01:16 +0000
Subject: [PATCH] Accepting request 295322 from
 home:a_faerber:branches:Virtualization

Avoid libseccomp breakage on armv7l by disabling it there

OBS-URL: https://build.opensuse.org/request/show/295322
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=247
---
 qemu.changes |  6 ++++++
 qemu.spec    | 10 ++++++++--
 qemu.spec.in | 10 ++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/qemu.changes b/qemu.changes
index 8d8412b..62c4814 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 10 08:59:34 UTC 2015 - afaerber@suse.de
+
+- Suppress seccomp for Factory armv7l (broken in libseccomp v2.2.0)
+- Disable glusterfs explicitly on Factory, SLE12 and before 13.1
+
 -------------------------------------------------------------------
 Thu Apr  9 15:13:44 UTC 2015 - afaerber@suse.de
 
diff --git a/qemu.spec b/qemu.spec
index 4f941c3..b3cd532 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -126,7 +126,7 @@ BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
 BuildRequires:  glusterfs-devel
 %endif
 %if 0%{?suse_version} >= 1220
@@ -620,6 +620,8 @@ done
 	--enable-fdt \
 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320
 	--enable-glusterfs \
+%else
+	--disable-glusterfs \
 %endif
 	--enable-gtk \
 %if 0%{?suse_version} >= 1220
@@ -661,10 +663,14 @@ done
 %endif
 	--enable-sdl \
 	--with-sdlabi=1.2 \
-%ifnarch ppc64le
+%ifnarch ppc64le %arm
 %if 0%{?suse_version} > 1320
 	--enable-seccomp \
+%else
+	--disable-seccomp \
 %endif
+%else
+	--disable-seccomp \
 %endif
 	--enable-smartcard-nss \
 %if 0%{?suse_version} >= 1310
diff --git a/qemu.spec.in b/qemu.spec.in
index 316e277..7536619 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -89,7 +89,7 @@ BuildRequires:  e2fsprogs-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315
 BuildRequires:  glusterfs-devel
 %endif
 %if 0%{?suse_version} >= 1220
@@ -546,6 +546,8 @@ done
 	--enable-fdt \
 %if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320
 	--enable-glusterfs \
+%else
+	--disable-glusterfs \
 %endif
 	--enable-gtk \
 %if 0%{?suse_version} >= 1220
@@ -587,10 +589,14 @@ done
 %endif
 	--enable-sdl \
 	--with-sdlabi=1.2 \
-%ifnarch ppc64le
+%ifnarch ppc64le %arm
 %if 0%{?suse_version} > 1320
 	--enable-seccomp \
+%else
+	--disable-seccomp \
 %endif
+%else
+	--disable-seccomp \
 %endif
 	--enable-smartcard-nss \
 %if 0%{?suse_version} >= 1310