From a6d77fddaf2c35be433e440720f2a9beea3da71e Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Wed, 16 May 2018 18:23:22 -0500
Subject: [PATCH] qemu: rhel: Remove librados to allow build.

Build qemu without librados. This allows build qemu in OBS.

Fixes: #37

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
---
 qemu-lite/qemu-lite.spec-template       | 15 +++++++++++++--
 qemu-vanilla/qemu-vanilla.spec-template | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/qemu-lite/qemu-lite.spec-template b/qemu-lite/qemu-lite.spec-template
index 1315542deb..ff1a81e3c2 100644
--- a/qemu-lite/qemu-lite.spec-template
+++ b/qemu-lite/qemu-lite.spec-template
@@ -27,12 +27,16 @@ BuildRequires : libtool
 BuildRequires : m4
 BuildRequires : findutils
 
-%if 0%{?rhel_version} || 0%{?centos_version}
+%if 0%{?centos_version}
 BuildRequires : librbd1-devel
 %else
+
+%if ! 0%{?rhel_version}
 BuildRequires : librbd-devel
 %endif
 
+%endif
+
 %if 0%{?suse_version}
 BuildRequires : libnuma-devel
 %else
@@ -78,7 +82,14 @@ chmod +x %{_sourcedir}/configure-hypervisor.sh
 %build
 export LANG=C
 
-eval "%{_sourcedir}/configure-hypervisor.sh" "qemu-lite" | xargs ./configure --prefix=/usr
+# RHEL in OBS does not provide librados.
+# Remove it: See https://github.com/kata-containers/packaging/issues/36
+"%{_sourcedir}/configure-hypervisor.sh" "qemu-lite" \
+%if 0%{?rhel_version}
+	| sed -e 's/--enable-rbd//g' \
+%endif
+	| xargs ./configure --prefix=/usr
+
 make V=1  %{?_smp_mflags}
 
 %install
diff --git a/qemu-vanilla/qemu-vanilla.spec-template b/qemu-vanilla/qemu-vanilla.spec-template
index f0dcc4f127..6572cb57a8 100644
--- a/qemu-vanilla/qemu-vanilla.spec-template
+++ b/qemu-vanilla/qemu-vanilla.spec-template
@@ -27,12 +27,16 @@ BuildRequires : libtool
 BuildRequires : m4
 BuildRequires : findutils
 
-%if 0%{?rhel_version} || 0%{?centos_version}
+%if 0%{?centos_version}
 BuildRequires : librbd1-devel
 %else
+
+%if ! 0%{?rhel_version}
 BuildRequires : librbd-devel
 %endif
 
+%endif
+
 %if 0%{?suse_version}
 BuildRequires : libnuma-devel
 %else
@@ -78,7 +82,14 @@ chmod +x %{_sourcedir}/configure-hypervisor.sh
 %build
 export LANG=C
 
-eval "%{_sourcedir}/configure-hypervisor.sh" "qemu-vanilla" | xargs ./configure --prefix=/usr
+# RHEL in OBS does not provide librados.
+# Remove it: See https://github.com/kata-containers/packaging/issues/36
+"%{_sourcedir}/configure-hypervisor.sh" "qemu-vanilla" \
+%if 0%{?rhel_version}
+	| sed -e 's/--enable-rbd//g' \
+%endif
+	| xargs ./configure --prefix=/usr
+
 make V=1  %{?_smp_mflags}
 
 %install