From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 5 Mar 2015 10:40:54 +0000 (+0100)
Subject: spec: Enable RBD storage driver in RHEL-7
X-Git-Tag: v1.2.14-rc1~266
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cfc8834c858849cc74c3082078dc91fb1cbae38;p=thirdparty%2Flibvirt.git

spec: Enable RBD storage driver in RHEL-7

Use correct package names too as they differ.
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 12bd17cdc0..ce792e6d08 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -108,7 +108,7 @@
 %define with_storage_iscsi    0%{!?_without_storage_iscsi:%{server_drivers}}
 %define with_storage_disk     0%{!?_without_storage_disk:%{server_drivers}}
 %define with_storage_mpath    0%{!?_without_storage_mpath:%{server_drivers}}
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
     %define with_storage_rbd      0%{!?_without_storage_rbd:%{server_drivers}}
 %else
     %define with_storage_rbd      0
@@ -182,6 +182,13 @@
     %endif
 %endif
 
+# librados and librbd are built only on x86_64 on rhel
+%ifnarch x86_64
+    %if 0%{?rhel} >= 7
+        %define with_storage_rbd 0
+    %endif
+%endif
+
 # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
 # VMWare, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
 # or HyperV.
@@ -566,7 +573,12 @@ BuildRequires: device-mapper-devel
     %endif
 %endif
 %if %{with_storage_rbd}
+    %if 0%{?rhel} >= 7
+BuildRequires: librados2-devel
+BuildRequires: librbd1-devel
+    %else
 BuildRequires: ceph-devel
+    %endif
 %endif
 %if %{with_storage_gluster}
     %if 0%{?rhel} >= 6