From 7b2f75044122a4795805ec98de9a58c231d90ff9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 29 Mar 2022 08:17:21 -0400
Subject: [PATCH] import pmdk-1.11.1-1.module+el8.6.0+14043+a2e27587

---
 .gitignore                                       |  2 +-
 .pmdk.metadata                                   |  2 +-
 SOURCES/Makefile-bypass-check-doc-in-check.patch | 11 +++++++++++
 SOURCES/pmdk-use-platform-python.patch           | 16 ++++++++--------
 SPECS/pmdk.spec                                  |  7 ++++++-
 5 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 SOURCES/Makefile-bypass-check-doc-in-check.patch

diff --git a/.gitignore b/.gitignore
index b1fd22b..4445e78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pmdk-1.9.2.tar.gz
+SOURCES/pmdk-1.11.1.tar.gz
diff --git a/.pmdk.metadata b/.pmdk.metadata
index 47f4f00..3d3207e 100644
--- a/.pmdk.metadata
+++ b/.pmdk.metadata
@@ -1 +1 @@
-64f483b1869e76d008c744384e85dad34789fb27 SOURCES/pmdk-1.9.2.tar.gz
+e180377efa67f3db8c5fd322737e4f1f1cfb4eb9 SOURCES/pmdk-1.11.1.tar.gz
diff --git a/SOURCES/Makefile-bypass-check-doc-in-check.patch b/SOURCES/Makefile-bypass-check-doc-in-check.patch
new file mode 100644
index 0000000..356422f
--- /dev/null
+++ b/SOURCES/Makefile-bypass-check-doc-in-check.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -89,7 +89,7 @@ check-remote: require-rpmem all
+ test check pcheck pycheck: all
+	$(MAKE) -C src $@
+
+-check pcheck pycheck: check-doc
++pcheck pycheck: check-doc
+
+ cstyle:
+	test -d .git && utils/check-commits.sh
diff --git a/SOURCES/pmdk-use-platform-python.patch b/SOURCES/pmdk-use-platform-python.patch
index 6e095bd..ceef174 100644
--- a/SOURCES/pmdk-use-platform-python.patch
+++ b/SOURCES/pmdk-use-platform-python.patch
@@ -1,7 +1,7 @@
-diff -up pmdk-1.9.2/src/Makefile.orig pmdk-1.9.2/src/Makefile
---- pmdk-1.9.2/src/Makefile.orig	2021-01-06 16:53:52.717410291 -0500
-+++ pmdk-1.9.2/src/Makefile	2021-01-06 16:53:52.718410294 -0500
-@@ -186,7 +186,7 @@ install: all pkg-config
+diff -up pmdk-1.11.1/src/Makefile.orig pmdk-1.11.1/src/Makefile
+--- pmdk-1.11.1/src/Makefile.orig	2022-01-13 18:51:59.452875151 -0500
++++ pmdk-1.11.1/src/Makefile	2022-01-13 18:54:25.780482444 -0500
+@@ -188,7 +188,7 @@ install: all pkg-config
  	install -d $(PMREORDER_DESTDIR)
  	install -p -m 0644 $(PMREORDER_FILES) $(PMREORDER_DESTDIR)
  	@echo "#!/bin/sh" > $(PMREORDER_SRC)/pmreorder
@@ -10,12 +10,12 @@ diff -up pmdk-1.9.2/src/Makefile.orig pmdk-1.9.2/src/Makefile
  	install -d $(PMREORDER_BIN)
  	install -p $(PMREORDER_SRC)/pmreorder $(PMREORDER_BIN)
  	$(RM) $(PKG_CONFIG_FILES)
-diff -up pmdk-1.9.2/src/test/RUNTESTS.py.orig pmdk-1.9.2/src/test/RUNTESTS.py
---- pmdk-1.9.2/src/test/RUNTESTS.py.orig	2021-01-06 16:54:37.937567105 -0500
-+++ pmdk-1.9.2/src/test/RUNTESTS.py	2021-01-06 16:54:37.938567109 -0500
+diff -up pmdk-1.11.1/src/test/RUNTESTS.py.orig pmdk-1.11.1/src/test/RUNTESTS.py
+--- pmdk-1.11.1/src/test/RUNTESTS.py.orig	2022-01-13 18:52:09.080401838 -0500
++++ pmdk-1.11.1/src/test/RUNTESTS.py	2022-01-13 18:54:46.129368430 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/libexec/platform-python
  # SPDX-License-Identifier: BSD-3-Clause
- # Copyright 2019-2020, Intel Corporation
+ # Copyright 2019-2021, Intel Corporation
  
diff --git a/SPECS/pmdk.spec b/SPECS/pmdk.spec
index 76e8fb8..32bf885 100644
--- a/SPECS/pmdk.spec
+++ b/SPECS/pmdk.spec
@@ -17,7 +17,7 @@
 %define min_ndctl_ver 60.1
 
 Name:		pmdk
-Version:	1.9.2
+Version:	1.11.1
 Release:	1%{?dist}
 Summary:	Persistent Memory Development Kit (former NVML)
 License:	BSD
@@ -25,6 +25,7 @@ URL:		http://pmem.io/pmdk
 
 Source0:	https://github.com/pmem/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:		pmdk-use-platform-python.patch
+Patch1:		Makefile-bypass-check-doc-in-check.patch
 
 BuildRequires:	gcc
 BuildRequires:	make
@@ -598,6 +599,10 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
 
 
 %changelog
+* Tue Jan 25 2022 Bryan Gurney <bgurney@redhat.com> - 1.11.1-1.el8
+- Update to pmdk version 1.11.1
+- Related: rhbz#2009889
+
 * Wed Jan  6 2021 Jeff Moyer <jmoyer@redhat.com> - 1.9.2-1.el8
 - Package pmdk version 1.9.2 for stream 1-fileformat-v6-rhel-8.3.1
 - libvmem is no longer packaged as part of pmdk.