From b31bdce3271918b33939987f934cd6153d51e003 Mon Sep 17 00:00:00 2001
From: xing_xing1992 <xingxing@xfusion.com>
Date: Fri, 30 Dec 2022 01:58:59 +0800
Subject: [PATCH 1/2] Remove the infiniband-diags package and remove the perl
 dependency

---
 rdma-core.spec | 93 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/rdma-core.spec b/rdma-core.spec
index fc74128..de3da18 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -1,6 +1,6 @@
 Name:           rdma-core
 Version:        41.0
-Release:        8
+Release:        9
 Summary:        RDMA core userspace libraries and daemons
 License:        GPLv2 or BSD
 Url:            https://github.com/linux-rdma/rdma-core
@@ -104,6 +104,20 @@ Specifically this contains the userspace libraries for the following device node
   - /dev/infiniband/rdma_cm (librdmacm)
   - /dev/infiniband/umadX (libibumad)
 
+%package -n infiniband-diags
+Summary: InfiniBand Diagnostic Tools
+Requires: libibumad%{?_isa} = %{version}-%{release}
+Provides: perl(IBswcountlimits)
+Provides: libibmad = %{version}-%{release}
+Obsoletes: libibmad < %{version}-%{release}
+Obsoletes: openib-diags < 1.3
+
+%description -n infiniband-diags
+This package provides IB diagnostic programs and scripts needed to diagnose an
+IB subnet.  infiniband-diags now also provides libibmad.  libibmad provides
+low layer IB functions for use by the IB diagnostic and management
+programs. These include MAD, SA, SMP, and other basic IB functions.
+
 %package        devel
 Summary:        RDMA core development libraries and headers
 Requires:       %{name} = %{version}-%{release}
@@ -264,6 +278,77 @@ fi
 %{_libdir}/librdmacm*.so.*
 %{_libdir}/rsocket/*.so*
 
+%files -n infiniband-diags
+%{_sbindir}/ibaddr
+%{_mandir}/man8/ibaddr*
+%{_sbindir}/ibnetdiscover
+%{_mandir}/man8/ibnetdiscover*
+%{_sbindir}/ibping
+%{_mandir}/man8/ibping*
+%{_sbindir}/ibportstate
+%{_mandir}/man8/ibportstate*
+%{_sbindir}/ibroute
+%{_mandir}/man8/ibroute.*
+%{_sbindir}/ibstat
+%{_mandir}/man8/ibstat.*
+%{_sbindir}/ibsysstat
+%{_mandir}/man8/ibsysstat*
+%{_sbindir}/ibtracert
+%{_mandir}/man8/ibtracert*
+%{_sbindir}/perfquery
+%{_mandir}/man8/perfquery*
+%{_sbindir}/sminfo
+%{_mandir}/man8/sminfo*
+%{_sbindir}/smpdump
+%{_mandir}/man8/smpdump*
+%{_sbindir}/smpquery
+%{_mandir}/man8/smpquery*
+%{_sbindir}/saquery
+%{_mandir}/man8/saquery*
+%{_sbindir}/vendstat
+%{_mandir}/man8/vendstat*
+%{_sbindir}/iblinkinfo
+%{_mandir}/man8/iblinkinfo*
+%{_sbindir}/ibqueryerrors
+%{_mandir}/man8/ibqueryerrors*
+%{_sbindir}/ibcacheedit
+%{_mandir}/man8/ibcacheedit*
+%{_sbindir}/ibccquery
+%{_mandir}/man8/ibccquery*
+%{_sbindir}/ibccconfig
+%{_mandir}/man8/ibccconfig*
+%{_sbindir}/dump_fts
+%{_mandir}/man8/dump_fts*
+%{_sbindir}/ibhosts
+%{_mandir}/man8/ibhosts*
+%{_sbindir}/ibswitches
+%{_mandir}/man8/ibswitches*
+%{_sbindir}/ibnodes
+%{_mandir}/man8/ibnodes*
+%{_sbindir}/ibrouters
+%{_mandir}/man8/ibrouters*
+%{_sbindir}/ibfindnodesusing.pl
+%{_mandir}/man8/ibfindnodesusing*
+%{_sbindir}/ibidsverify.pl
+%{_mandir}/man8/ibidsverify*
+%{_sbindir}/check_lft_balance.pl
+%{_mandir}/man8/check_lft_balance*
+%{_sbindir}/dump_lfts.sh
+%{_mandir}/man8/dump_lfts*
+%{_sbindir}/dump_mfts.sh
+%{_mandir}/man8/dump_mfts*
+%{_sbindir}/ibclearerrors
+%{_mandir}/man8/ibclearerrors*
+%{_sbindir}/ibclearcounters
+%{_mandir}/man8/ibclearcounters*
+%{_sbindir}/ibstatus
+%{_mandir}/man8/ibstatus*
+%{_mandir}/man8/infiniband-diags*
+%{_libdir}/libibmad*.so.*
+%{_libdir}/libibnetdisc*.so.*
+%{perl_vendorlib}/IBswcountlimits.pm
+%config(noreplace) %{_sysconfdir}/infiniband-diags/error_thresholds
+%config(noreplace) %{_sysconfdir}/infiniband-diags/ibdiag.conf
 
 %files devel
 %defattr(-,root,root)
@@ -292,6 +377,12 @@ fi
 %{_mandir}/*
 
 %changelog
+* Fri Dec 30 2022 Yixing Liu <xingxing@xfusion.com> - 41.0-9
+- Type: requirement
+- ID: NA
+- SUG: NA
+- DESC: Remove the infiniband-diags package and remove the perl dependency
+
 * Wed Dec 14 2022 Yixing Liu <liuyixing1@huawei.com> - 41.0-6
 - Type: requirement
 - ID: NA
-- 
Gitee


From 982c9ab189925f6fabeaf25a892cf36ed2fd31ee Mon Sep 17 00:00:00 2001
From: xing_xing1992 <xingxing@xfusion.com>
Date: Mon, 2 Jan 2023 21:46:21 +0800
Subject: [PATCH 2/2] Add the infiniband diags package and delete the perl
 dependency

---
 rdma-core.spec | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/rdma-core.spec b/rdma-core.spec
index de3da18..27e9acf 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -58,10 +58,6 @@ Obsoletes:      ibacm infiniband-diags-compat infiniband-diags libibverbs libibv
 
 Provides:       rdma = %{version}-%{release}
 Obsoletes:      rdma < %{version}-%{release}
-Provides:       perl(IBswcountlimits)
-Provides:       libibmad = %{version}-%{release}
-Obsoletes:      libibmad < %{version}-%{release}
-Obsoletes:      openib-diags < 1.3
 Provides:       libcxgb4 = %{version}-%{release}
 Obsoletes:      libcxgb4 < %{version}-%{release}
 Provides:       libefa = %{version}-%{release}
@@ -377,13 +373,13 @@ fi
 %{_mandir}/*
 
 %changelog
-* Fri Dec 30 2022 Yixing Liu <xingxing@xfusion.com> - 41.0-9
+* Fri Dec 30 2022 xingxing <xingxing@xfusion.com> - 41.0-9
 - Type: requirement
 - ID: NA
 - SUG: NA
-- DESC: Remove the infiniband-diags package and remove the perl dependency
+- DESC: Add the infiniband diags package and delete the perl dependency
 
-* Wed Dec 14 2022 Yixing Liu <liuyixing1@huawei.com> - 41.0-6
+* Wed Dec 14 2022 Yixing Liu <liuyixing1@huawei.com> - 41.0-8
 - Type: requirement
 - ID: NA
 - SUG: NA
-- 
Gitee