]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Don't use ceph-devel on Fedora
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 8 May 2017 09:54:08 +0000 (10:54 +0100)
committerCole Robinson <crobinso@redhat.com>
Wed, 10 May 2017 22:02:40 +0000 (18:02 -0400)
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 <pkrempa@redhat.com>
  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 <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit 472759407870678e629ba40759a24ea350f1874f)

libvirt.spec.in

index 78c3c28e161d470426835df98ec43c5d77e281ad..fd57f8ffd14113b397ee9fb2e6d9722c4496d6ea 100644 (file)
@@ -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