From c7220d10667be19bb9c66049ce986df074e2768f Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney@redhat.com>
Date: Wed, 13 Oct 2021 17:34:37 -0400
Subject: [PATCH] Update to PMDK version 1.10.1

Also, remove the BuildRequires line for libfabric-devel

Related: rhbz#1874208
Related: rhbz#2009502

Signed-off-by: Bryan Gurney <bgurney@redhat.com>
---
 .gitignore      |  2 ++
 nvml.spec       | 32 +++++++++++---------------------
 sources         |  4 ++--
 tests/tests.yml |  1 -
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9e44e92..c4df686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /pmdk-1.9.2.tar.gz
 /pmdk-1.10.tar.gz
 /pmdk-1.10-man.tar.gz
+/pmdk-1.10.1.tar.gz
+/pmdk-1.10.1-man.tar.gz
diff --git a/nvml.spec b/nvml.spec
index 7c4bed2..c47d555 100644
--- a/nvml.spec
+++ b/nvml.spec
@@ -1,21 +1,14 @@
 
 # rpmbuild options:
-#   --with | --without fabric
 #   --with | --without ndctl
 
 # do not terminate build if files in the $RPM_BUILD_ROOT
-# directory are not found in %%files (without fabric case)
+# directory are not found in %%files (without pmemcheck case)
 %define _unpackaged_files_terminate_build 0
 
 # disable 'make check'
 %define _skip_check 1
 
-%if (0%{?suse_version} > 1315) || (0%{?fedora} >= 27) || (0%{?rhel} >= 7)
-%bcond_without fabric
-%else
-%bcond_with fabric
-%endif
-
 # by default build with ndctl, unless explicitly disabled
 %bcond_without ndctl
 
@@ -23,13 +16,12 @@
 # pmemcheck is not packaged by Fedora
 %bcond_with pmemcheck
 
-%define min_libfabric_ver 1.4.2
 %define min_ndctl_ver 60.1
-%define upstreamversion 1.10
+%define upstreamversion 1.10.1
 
 Name:		nvml
-Version:	1.10
-Release:	11%{?dist}
+Version:	1.10.1
+Release:	1%{?dist}
 Summary:	Persistent Memory Development Kit (formerly NVML)
 License:	BSD
 URL:		http://pmem.io/pmdk
@@ -43,9 +35,7 @@ Source1:	pmdk-%{version}-man.tar.gz
 # do_open passes "attr" to util_pool_open which potentially reads that object
 # but do_open never initializes "attr"
 # may read that object
-Patch0:         0001-test-util_badblock-don-t-pass-uninitialized-attr.patch
-Patch1:         0001-common-fix-a-mismatch-between-prototype-and-body.patch
-Patch2:         Makefile-bypass-check-doc-in-check.patch
+Patch0:         Makefile-bypass-check-doc-in-check.patch
 
 
 BuildRequires:	gcc
@@ -63,10 +53,6 @@ BuildRequires:	ndctl-devel >= %{min_ndctl_ver}
 BuildRequires:	daxctl-devel >= %{min_ndctl_ver}
 %endif
 
-%if %{with fabric}
-BuildRequires:	libfabric-devel >= %{min_libfabric_ver}
-%endif
-
 # for tests
 BuildRequires:	gdb
 BuildRequires:	bc
@@ -524,8 +510,6 @@ provided in the command line options to check whether files are in a consistent
 %prep
 %setup -q -n pmdk-%{upstreamversion}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 
 %build
@@ -608,6 +592,12 @@ mkdir -p %{buildroot}%{_mandir}
 
 
 %changelog
+* Thu Oct 14 2021 Bryan Gurney <bgurney@redhat.com> - 1.10.1-1
+- Update to PMDK version 1.10.1
+- Related: rhbz#1874208
+- Remove BuildRequires line for libfabric-devel
+- Related: rhbz#2009502
+
 * Mon Oct 04 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-11
 - Do not generate librpmem man pages
 - Related: rhbz#2002998
diff --git a/sources b/sources
index 08947cb..92c94c4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pmdk-1.10.tar.gz) = 1b284703bc51240b854c48b008ef00b12ac270db8a9ba64980bce626574d2b813a6e0ed6bfe858ac91e8afb9d72fee24545b5004ff2c3cb25344af4e42908beb
-SHA512 (pmdk-1.10-man.tar.gz) = 1135736a36233ffbc4e03d39d7e8468c736196ac629502480e49cf37be45790d314ca9222534411f72cd16f47c846ee3b6093bda0984de5bf9b2785ea76e602b
+SHA512 (pmdk-1.10.1.tar.gz) = 7fecb7a96a11eebe11295b9f18e4b318c69de5c54bf219be6d072fc409421cf028a9ee78d9777e3ee007065ee65143c9ae1fb3aefa66d9a1836a93adf81899e8
+SHA512 (pmdk-1.10.1-man.tar.gz) = df3c6b82def11048a26adf86b6ec6e39d286bb9f056131298996cce0d182b640e38242700629c5d78af438c0a862fd6d02e0c94ff32feee649d8b36ac7eb5ad2
diff --git a/tests/tests.yml b/tests/tests.yml
index 62acafb..0e22be5 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -17,7 +17,6 @@
         - pmempool
         - ndctl-devel
         - daxctl-devel
-        - libfabric-devel
         - gcc
         - make
         - glibc-devel