From c01686623197bd18cfe3a6564b0a75646b51017d Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Tue, 1 Aug 2017 09:40:50 -0400 Subject: [PATCH] rdma-core: revert ppc64le hack, handle libusnic_verbs - Revert work-around for ppc64le library issues - Add Obsoletes/Provides for libusnic_verbs Signed-off-by: Jarod Wilson --- rdma-core.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rdma-core.spec b/rdma-core.spec index c43260f..540889b 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core Version: 14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -138,6 +138,8 @@ Provides: libocrdma = %{version}-%{release} Obsoletes: libocrdma < %{version}-%{release} Provides: librxe = %{version}-%{release} Obsoletes: librxe < %{version}-%{release} +Provides: libusnic_verbs = %{version}-%{release} +Obsoletes: libusnic_verbs < %{version}-%{release} %description -n libibverbs libibverbs is a library that allows userspace processes to use RDMA @@ -315,13 +317,7 @@ install -D -m0644 redhat/rdma.fixup-mtrr.awk %{buildroot}%{_libexecdir}/rdma-fix install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh # ibacm -%ifnarch ppc64le bin/ib_acme -D . -O -%else -# hack alert: working around ib_acme failing on ppc64le -# bin/ib_acme: error while loading shared libraries: /builddir/build/BUILD/rdma-core-14/lib/libibverbs.so.1: expected localentry:0 `pthread_cond_init' -touch ibacm_opts.cfg -%endif # multi-lib conflict resolution hacks (bug 1429362) sed -i -e 's|%{_libdir}|/usr/lib|' %{buildroot}%{_mandir}/man7/ibacm_prov.7 sed -i -e 's|%{_libdir}|/usr/lib|' ibacm_opts.cfg @@ -508,6 +504,10 @@ rm -rf %{buildroot}/%{_initrddir}/ %doc %{_docdir}/%{name}-%{version}/ibsrpdm.md %changelog +* Tue Aug 01 2017 Jarod Wilson - 14-3 +- Revert work-around for ppc64le library issues +- Add Obsoletes/Provides for libusnic_verbs + * Thu Jul 27 2017 Fedora Release Engineering - 14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild