From 7dfd488d6d8cd73e93ded97c6230243eebd352a4 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 24 Aug 2017 13:15:00 -0400 Subject: [PATCH] libibverbs(-devel) is superceded by rdma-core(-devel) --- ceph.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ceph.spec b/ceph.spec index 7ac4e06..5622e77 100644 --- a/ceph.spec +++ b/ceph.spec @@ -86,7 +86,7 @@ ################################################################################# Name: ceph Version: 12.1.4 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 1 %endif @@ -198,18 +198,17 @@ BuildRequires: openldap2-devel BuildRequires: python-Cython BuildRequires: python-PrettyTable BuildRequires: python-Sphinx +# RDMA is no longer built on 32-bit ARM: see #1484155 +%ifnarch %{arm} BuildRequires: rdma-core-devel %endif +%endif %if 0%{?fedora} || 0%{?rhel} Requires: systemd BuildRequires: boost-random BuildRequires: btrfs-progs BuildRequires: nss-devel BuildRequires: keyutils-libs-devel -# RDMA is no longer built on 32-bit ARM: see #1484155 -%ifnarch %{arm} -BuildRequires: libibverbs-devel -%endif BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: redhat-lsb-core @@ -1798,6 +1797,9 @@ exit 0 %changelog +* Thu Aug 24 2017 Kaleb S. KEITHLEY - 1:12.1.4-4 +- libibverbs(-devel) is superceded by rdma-core(-devel) + * Tue Aug 22 2017 Adam Williamson - 1:12.1.4-3 - Disable RDMA support on 32-bit ARM (#1484155)