From b719fb20330690fb0b11972a2ba750099c850a25 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 8 May 2017 10:54:08 +0100 Subject: [PATCH] Don't use ceph-devel on Fedora A previous commit changed the spec to use librbd1-devel on RHEL-7, since this replaces ceph-devel from RHEL-6: commit 6cfc8834c858849cc74c3082078dc91fb1cbae38 Author: Peter Krempa Date: Thu Mar 5 11:40:54 2015 +0100 spec: Enable RBD storage driver in RHEL-7 Use correct package names too as they differ. RHEL-7 inherited this rename from Fedora though, so it should have also made Fedora use the new names. This was missed, because Fedora still provides a (deprecated) back-compat RPM for ceph-devel that just pulls in librbd1-devel (and others). Fixing this stops libvirt pulling Java into the build root in Fedora. Reviewed-by: Pavel Hrdina Signed-off-by: Daniel P. Berrange (cherry picked from commit 472759407870678e629ba40759a24ea350f1874f) --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 78c3c28e16..fd57f8ffd1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -359,7 +359,7 @@ BuildRequires: parted-devel # For Multipath support BuildRequires: device-mapper-devel %if %{with_storage_rbd} - %if 0%{?rhel} >= 7 + %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: librados2-devel BuildRequires: librbd1-devel %else