From c2c2262707a681344608d333b6cafe8aa2ccbe1b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 09 2020 20:06:41 +0000
Subject: import rdma-core-29.0-2.el8


---

diff --git a/SOURCES/ibdev2netdev b/SOURCES/ibdev2netdev
index 9d74123..440022d 100644
--- a/SOURCES/ibdev2netdev
+++ b/SOURCES/ibdev2netdev
@@ -161,7 +161,7 @@ if [ "x$oldstyle" == "xn" ]; then
               if [ -f $filepath_vpd ]; then
                 tmp=$ifs
                 ifs=":"
-                vpd_content=`cat $filepath_vpd`
+                vpd_content=`cat $filepath_vpd | tr -d '\0'`
                 devdesc=$(printf "%-15s" "$(echo $vpd_content | strings | head -1)")
                 partid=$(printf "%-11s" "$(echo $vpd_content | strings | head -4 | tail -1 | gawk '{print $1}')")
                 ifs=$tmp
diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec
index 4635481..b2209ef 100644
--- a/SPECS/rdma-core.spec
+++ b/SPECS/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
 Version: 29.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
@@ -259,7 +259,7 @@ discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
          -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \
          -DCMAKE_INSTALL_INITDDIR:PATH=%{_initrddir} \
          -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-         -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
+         -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \
          -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \
          -DCMAKE_INSTALL_PERLDIR:PATH=%{perl_vendorlib} \
          -DWITH_IBDIAGS_COMPAT:BOOL=False \
@@ -368,9 +368,9 @@ find %{buildroot}  -name '*efa*' -exec rm -fv {} \;
 
 %files
 %dir %{_sysconfdir}/rdma
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README.md
-%doc %{_docdir}/%{name}-%{version}/udev.md
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/README.md
+%doc %{_docdir}/%{name}/udev.md
 %config(noreplace) %{_sysconfdir}/rdma/*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
 %ifnarch s390
@@ -396,7 +396,7 @@ find %{buildroot}  -name '*efa*' -exec rm -fv {} \;
 %license COPYING.*
 
 %files devel
-%doc %{_docdir}/%{name}-%{version}/MAINTAINERS
+%doc %{_docdir}/%{name}/MAINTAINERS
 %dir %{_includedir}/infiniband
 %dir %{_includedir}/rdma
 %{_includedir}/infiniband/*
@@ -474,9 +474,9 @@ find %{buildroot}  -name '*efa*' -exec rm -fv {} \;
 %{_libdir}/libmlx5.so.*
 %endif
 %config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver
-%doc %{_docdir}/%{name}-%{version}/libibverbs.md
-%doc %{_docdir}/%{name}-%{version}/rxe.md
-%doc %{_docdir}/%{name}-%{version}/tag_matching.md
+%doc %{_docdir}/%{name}/libibverbs.md
+%doc %{_docdir}/%{name}/rxe.md
+%doc %{_docdir}/%{name}/tag_matching.md
 %{_bindir}/rxe_cfg
 %{_mandir}/man7/rxe*
 %ifnarch s390
@@ -501,7 +501,7 @@ find %{buildroot}  -name '*efa*' -exec rm -fv {} \;
 %{_unitdir}/ibacm.socket
 %dir %{_libdir}/ibacm
 %{_libdir}/ibacm/*
-%doc %{_docdir}/%{name}-%{version}/ibacm.md
+%doc %{_docdir}/%{name}/ibacm.md
 
 %files -n iwpmd
 %{_sbindir}/iwpmd
@@ -517,7 +517,7 @@ find %{buildroot}  -name '*efa*' -exec rm -fv {} \;
 %{_libdir}/librdmacm*.so.*
 %dir %{_libdir}/rsocket
 %{_libdir}/rsocket/librspreload.so*
-%doc %{_docdir}/%{name}-%{version}/librdmacm.md
+%doc %{_docdir}/%{name}/librdmacm.md
 %{_mandir}/man7/rsocket.*
 
 %files -n librdmacm-utils
@@ -561,9 +561,14 @@ find %{buildroot}  -name '*efa*' -exec rm -fv {} \;
 %{_mandir}/man5/srp_daemon_port@.service.5*
 %{_mandir}/man8/ibsrpdm.8*
 %{_mandir}/man8/srp_daemon.8*
-%doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
+%doc %{_docdir}/%{name}/ibsrpdm.md
 
 %changelog
+* Mon May 18 2020 Honggang Li <honli@redhat.com> - 29.0-2
+- Suppress ibdev2netdev warning messgae
+- Unversioned documentation directory
+- Resolves: bz1794904, bz1824853
+
 * Tue Apr 14 2020 Honggang Li <honli@redhat.com> - 29.0-1
 - Update to upstream v29 release for features and fixes
 - Resolves: bz1790624