From 4011a338f3de67ff079903a11e5e502f9debfb79 Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney@redhat.com>
Date: Thu, 16 Sep 2021 12:27:36 -0400
Subject: [PATCH] Do not build librpmem packages

- Do not build librpmem packages
- Related: rhbz#2002998

Signed-off-by: Bryan Gurney <bgurney@redhat.com>
---
 nvml.spec         | 84 +++--------------------------------------------
 tests/run_test.sh |  5 +++
 tests/tests.yml   |  1 -
 3 files changed, 10 insertions(+), 80 deletions(-)

diff --git a/nvml.spec b/nvml.spec
index 0cf9b33..26ddba8 100644
--- a/nvml.spec
+++ b/nvml.spec
@@ -29,7 +29,7 @@
 
 Name:		nvml
 Version:	1.10
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Persistent Memory Development Kit (formerly NVML)
 License:	BSD
 URL:		http://pmem.io/pmdk
@@ -454,80 +454,6 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 %doc ChangeLog CONTRIBUTING.md README.md
 
 
-%if %{with fabric}
-
-%package -n librpmem
-Summary: Remote Access to Persistent Memory library
-Requires: libfabric >= %{min_libfabric_ver}
-Requires: openssh-clients
-%description -n librpmem
-The librpmem library provides low-level support for remote access
-to persistent memory utilizing RDMA-capable NICs. It can be used
-to replicate persistent memory regions over RDMA protocol.
-
-%files -n librpmem
-%{_libdir}/librpmem.so.*
-%license LICENSE
-%doc ChangeLog CONTRIBUTING.md README.md
-
-
-%package -n librpmem-devel
-Summary: Development files for the Remote Access to Persistent Memory library
-Requires: librpmem = %{version}-%{release}
-%description -n librpmem-devel
-The librpmem library provides low-level support for remote access
-to persistent memory utilizing RDMA-capable NICs. It can be used
-to replicate persistent memory regions over RDMA protocol.
-
-This sub-package contains libraries and header files for developing
-applications that want to specifically make use of librpmem.
-
-%files -n librpmem-devel
-%{_libdir}/librpmem.so
-%{_libdir}/pkgconfig/librpmem.pc
-%{_includedir}/librpmem.h
-%{_mandir}/man7/librpmem.7.gz
-%{_mandir}/man3/rpmem_*.3.gz
-%license LICENSE
-%doc ChangeLog CONTRIBUTING.md README.md
-
-
-%package -n librpmem-debug
-Summary: Debug variant of the Remote Access to Persistent Memory library
-Requires: librpmem = %{version}-%{release}
-%description -n librpmem-debug
-The librpmem library provides low-level support for remote access
-to persistent memory utilizing RDMA-capable NICs. It can be used
-to replicate persistent memory regions over RDMA protocol.
-
-This sub-package contains debug variant of the library, providing
-run-time assertions and trace points. The typical way to access the
-debug version is to set the environment variable LD_LIBRARY_PATH to
-/usr/lib64/pmdk_debug.
-
-%files -n librpmem-debug
-%dir %{_libdir}/pmdk_debug
-%{_libdir}/pmdk_debug/librpmem.so
-%{_libdir}/pmdk_debug/librpmem.so.*
-%license LICENSE
-%doc ChangeLog CONTRIBUTING.md README.md
-
-
-%package -n rpmemd
-Summary: Target node process executed by librpmem
-Requires: libfabric >= %{min_libfabric_ver}
-%description -n rpmemd
-The rpmemd process is executed on a target node by librpmem library
-and facilitates access to persistent memory over RDMA.
-
-%files -n rpmemd
-%{_bindir}/rpmemd
-%{_mandir}/man1/rpmemd.1.gz
-
-# _with_fabric
-%endif
-
-
 %package -n pmempool
 Summary: Utilities for Persistent Memory
 Requires: libpmem >= %{version}-%{release}
@@ -676,16 +602,16 @@ mkdir -p %{buildroot}%{_mandir}
 %ldconfig_scriptlets   -n libpmemobj
 %ldconfig_scriptlets   -n libpmempool
 
-%if %{with fabric}
-%ldconfig_scriptlets   -n librpmem
-%endif
-
 %if 0%{?__debug_package} == 0
 %debug_package
 %endif
 
 
 %changelog
+* Thu Sep 16 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-10
+- Do not build librpmem packages
+- Related: rhbz#2002998
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10-9
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/tests/run_test.sh b/tests/run_test.sh
index f7dd5b5..225bbd0 100644
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -12,4 +12,9 @@ PMDK_LIB_PATH_NONDEBUG=/usr/lib64
 EOF
 
 cd source
+if [ ! -f .skip-doc ]
+then
+	touch .skip-doc
+fi
+
 make check
diff --git a/tests/tests.yml b/tests/tests.yml
index 55004e0..62acafb 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -14,7 +14,6 @@
         - libpmemlog-devel
         - libpmemobj-devel
         - libpmempool-devel
-        - librpmem-devel
         - pmempool
         - ndctl-devel
         - daxctl-devel