From 59a8e2e0d0ddba785fc79c4731e0b8685893458b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sep 14 2020 23:26:18 +0000
Subject: Split out libibverbs to a core sub package for libpcap IB support to minimise deps for users that don't require IB support


---

diff --git a/.gitignore b/.gitignore
index 9ef3895..332abe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,2 @@
 *.src.rpm
-/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
+/rdma-core-*.tar.gz
diff --git a/rdma-core.spec b/rdma-core.spec
index c8b3113..9f10f71 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
 Version: 31.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
@@ -142,6 +142,7 @@ 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}
@@ -187,6 +188,12 @@ 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}
@@ -350,6 +357,8 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
 
 %ldconfig_scriptlets -n libibverbs
 
+%ldconfig_scriptlets -n libibverbs-core
+
 %ldconfig_scriptlets -n libibumad
 
 %ldconfig_scriptlets -n librdmacm
@@ -383,6 +392,7 @@ fi
 %systemd_postun_with_restart iwpmd.service
 
 %files
+%license COPYING.*
 %dir %{_sysconfdir}/rdma
 %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/README.md
@@ -427,7 +437,6 @@ fi
 %{_unitdir}/rdma-ndd.service
 %{_mandir}/man7/rxe*
 %{_mandir}/man8/rdma-ndd.*
-%license COPYING.*
 
 %files devel
 %doc %{_docdir}/%{name}/MAINTAINERS
@@ -566,13 +575,16 @@ 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_*
@@ -661,6 +673,9 @@ fi
 %endif
 
 %changelog
+* Mon Sep 14 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 31.0-2
+- Split out libibverbs to sub package for libpcap
+
 * Wed Aug 19 2020 Honggang Li <honli@redhat.com> - 31.0-1
 - Rebase to upstream release v31.0