From 33ea88b4261c30141a158adedda29c31e0a09d2d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Dec 2019 19:37:41 -0700 Subject: [PATCH] Drop BR/R on rdma-core-devel on arm (bz#1780813) --- hwloc.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hwloc.spec b/hwloc.spec index 2898746..00a5439 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,7 +1,7 @@ Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Name: hwloc Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://www.open-mpi.org/projects/hwloc/ Source0: http://www.open-mpi.org/software/hwloc/v2.0/downloads/%{name}-%{version}.tar.bz2 @@ -23,7 +23,9 @@ BuildRequires: desktop-file-utils %ifnarch s390 %{arm} BuildRequires: numactl-devel %endif +%ifnarch %{arm} BuildRequires: rdma-core-devel +%endif %ifarch %{ix86} x86_64 %{?systemd_requires} BuildRequires: systemd @@ -46,7 +48,9 @@ about the hardware, bind processes, and much more. %package devel Summary: Headers and shared development libraries for hwloc Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%ifnarch %{arm} Requires: rdma-core-devel%{?_isa} +%endif %description devel Headers and shared object symbolic links for the hwloc. @@ -169,6 +173,9 @@ LD_LIBRARY_PATH=$PWD/hwloc/.libs make check %{_libdir}/%{name}/hwloc* %changelog +* Mon Dec 09 2019 Orion Poplawski - 2.0.4-2 +- Drop BR/R on rdma-core-devel on arm (bz#1780813) + * Sat Aug 24 2019 Zbigniew Jędrzejewski-Szmek - 2.0.4-1 - Update to latest version (#1663624)