From 685eea613d5e277f00456acec78e75f0c16edb51 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 19 Jan 2021 03:09:20 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/rdma-core.git#ef8db100db16dfbfec42ed58eb0d2e57ca81bc0a --- .gitignore | 12 +++++++++++- rdma-core.spec | 29 +++++++---------------------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 332abe0..9ef3895 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,12 @@ *.src.rpm -/rdma-core-*.tar.gz +/rdma-core-12.tgz +/rdma-core-12.tar.gz +/rdma-core-14.tar.gz +/rdma-core-16.2.tar.gz +/rdma-core-20.1.tar.gz +/rdma-core-26.1.tar.gz +/rdma-core-27.0.tar.gz +/rdma-core-28.0.tar.gz +/rdma-core-29.0.tar.gz +/rdma-core-30.0.tar.gz +/rdma-core-31.0.tar.gz diff --git a/rdma-core.spec b/rdma-core.spec index 13923d3..daa2423 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core Version: 32.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -88,7 +88,6 @@ scripts, dracut rules, and the rdma-ndd utility. %package devel Summary: RDMA core development libraries and headers -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libibverbs%{?_isa} = %{version}-%{release} Provides: libibverbs-devel = %{version}-%{release} Obsoletes: libibverbs-devel < %{version}-%{release} @@ -141,8 +140,6 @@ compatibility reasons. %package -n libibverbs Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libibverbs-core%{?_isa} = %{version}-%{release} Provides: libcxgb4 = %{version}-%{release} Obsoletes: libcxgb4 < %{version}-%{release} Provides: libefa = %{version}-%{release} @@ -188,12 +185,6 @@ Device-specific plug-in ibverbs userspace drivers are included: - libsiw: A software implementation of the iWarp protocol - libvmw_pvrdma: VMware paravirtual RDMA device -%package -n libibverbs-core -Summary: The main libibverbs library - -%description -n libibverbs-core -The main libibverbs library. - %package -n libibverbs-utils Summary: Examples for the libibverbs library Requires: libibverbs%{?_isa} = %{version}-%{release} @@ -204,7 +195,6 @@ displays information about RDMA devices. %package -n ibacm Summary: InfiniBand Communication Manager Assistant -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n ibacm The ibacm daemon helps reduce the load of managing path record lookups on @@ -218,7 +208,6 @@ library knows how to talk directly to the ibacm daemon to retrieve data. %package -n iwpmd Summary: iWarp Port Mapper userspace daemon -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n iwpmd iwpmd provides a userspace service for iWarp drivers to claim @@ -226,7 +215,6 @@ tcp ports through the standard socket interface. %package -n libibumad Summary: OpenFabrics Alliance InfiniBand umad (userspace management datagram) library -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n libibumad libibumad provides the userspace management datagram (umad) library @@ -235,7 +223,6 @@ are used by the IB diagnostic and management tools, including OpenSM. %package -n librdmacm Summary: Userspace RDMA Connection Manager -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n librdmacm librdmacm provides a userspace RDMA Communication Management API. @@ -252,7 +239,6 @@ Summary: Tools for using the InfiniBand SRP protocol devices Obsoletes: srptools <= 1.0.3 Provides: srptools = %{version}-%{release} Obsoletes: openib-srptools <= 0.0.6 -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n srp_daemon In conjunction with the kernel ib_srp driver, srp_daemon allows you to @@ -353,8 +339,6 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh %ldconfig_scriptlets -n libibverbs -%ldconfig_scriptlets -n libibverbs-core - %ldconfig_scriptlets -n libibumad %ldconfig_scriptlets -n librdmacm @@ -388,7 +372,6 @@ fi %systemd_postun_with_restart iwpmd.service %files -%license COPYING.* %dir %{_sysconfdir}/rdma %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/README.md @@ -427,6 +410,7 @@ fi %{_unitdir}/rdma-ndd.service %{_mandir}/man7/rxe* %{_mandir}/man8/rdma-ndd.* +%license COPYING.* %files devel %doc %{_docdir}/%{name}/MAINTAINERS @@ -565,16 +549,13 @@ fi %dir %{_sysconfdir}/libibverbs.d %dir %{_libdir}/libibverbs %{_libdir}/libefa.so.* +%{_libdir}/libibverbs*.so.* %{_libdir}/libibverbs/*.so %{_libdir}/libmlx5.so.* %{_libdir}/libmlx4.so.* %config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver %doc %{_docdir}/%{name}/libibverbs.md -%files -n libibverbs-core -%license COPYING.* -%{_libdir}/libibverbs*.so.* - %files -n libibverbs-utils %{_bindir}/ibv_* %{_mandir}/man1/ibv_* @@ -663,6 +644,10 @@ fi %endif %changelog +* Mon Jan 18 2021 Honggang Li - 32.0-2 +- Remove base package dependency from all sub-packages +- Resolves: bz1901086 + * Thu Oct 29 2020 Honggang Li - 32.0-1 - Rebase to upstream release v32.0