From nobody Tue May 7 17:13:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1494237418900906.2610242684175; Mon, 8 May 2017 02:56:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CA5BE7F4B8; Mon, 8 May 2017 09:56:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D8EC171BE; Mon, 8 May 2017 09:56:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B139B1800C80; Mon, 8 May 2017 09:56:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v489urlx028174 for ; Mon, 8 May 2017 05:56:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 361BE94C48; Mon, 8 May 2017 09:56:53 +0000 (UTC) Received: from t460.redhat.com (ovpn-116-182.ams2.redhat.com [10.36.116.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5016994C4C; Mon, 8 May 2017 09:56:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CA5BE7F4B8 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CA5BE7F4B8 From: "Daniel P. Berrange" To: libvir-list@redhat.com Date: Mon, 8 May 2017 10:56:47 +0100 Message-Id: <20170508095647.24630-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] Don't use ceph-devel on Fedora X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 08 May 2017 09:56:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 split 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. Signed-off-by: Daniel P. Berrange --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b249224..4c7b658 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} >=3D 7 + %if 0%{?fedora} || 0%{?rhel} >=3D 7 BuildRequires: librados2-devel BuildRequires: librbd1-devel %else --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list