From 2ddd6ae93f2195e69c883075117b1fd35a9fc6e6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Apr 2020 04:49:56 -0400
Subject: [PATCH] import pmdk-1.6.1-1.el8

---
 .gitignore                          |  2 +-
 .pmdk.metadata                      |  2 +-
 SOURCES/pmdk-fix-dynamic-link.patch | 13 -------------
 SPECS/pmdk.spec                     | 13 +++++++------
 4 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 SOURCES/pmdk-fix-dynamic-link.patch

diff --git a/.gitignore b/.gitignore
index a1d6957..ee5f637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pmdk-1.6.tar.gz
+SOURCES/pmdk-1.6.1.tar.gz
diff --git a/.pmdk.metadata b/.pmdk.metadata
index 2bf082b..731f21e 100644
--- a/.pmdk.metadata
+++ b/.pmdk.metadata
@@ -1 +1 @@
-fd79ab8f42ba80c7f3a3a1944ef2baccf9c83bd6 SOURCES/pmdk-1.6.tar.gz
+c09c4ee03c00339483d27b578b52ab02f5b246b8 SOURCES/pmdk-1.6.1.tar.gz
diff --git a/SOURCES/pmdk-fix-dynamic-link.patch b/SOURCES/pmdk-fix-dynamic-link.patch
deleted file mode 100644
index 80d9749..0000000
--- a/SOURCES/pmdk-fix-dynamic-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/tools/Makefile.inc b/src/tools/Makefile.inc
-index 3bda2ee3b..57364fcbc 100644
---- a/src/tools/Makefile.inc
-+++ b/src/tools/Makefile.inc
-@@ -149,7 +149,7 @@ LIBPMEMCOMMON=y
- endif
- 
- ifeq ($(LIBPMEMCOMMON), y)
--DYNAMIC_LIBS += $(LIBSDIR_DEBUG)/libpmemcommon.a
-+DYNAMIC_LIBS += -lpmemcommon
- STATIC_DEBUG_LIBS += $(LIBSDIR_DEBUG)/libpmemcommon.a
- STATIC_NONDEBUG_LIBS += $(LIBSDIR_NONDEBUG)/libpmemcommon.a
- CFLAGS += -I$(TOP)/src/common
diff --git a/SPECS/pmdk.spec b/SPECS/pmdk.spec
index cf1b2d5..80b0304 100644
--- a/SPECS/pmdk.spec
+++ b/SPECS/pmdk.spec
@@ -17,15 +17,14 @@
 %define min_ndctl_ver 60.1
 
 Name:		pmdk
-Version:	1.6
-Release:	2%{?dist}
+Version:	1.6.1
+Release:	1%{?dist}
 Summary:	Persistent Memory Development Kit (former NVML)
 License:	BSD
 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:		pmdk-fix-dynamic-link.patch
 
 BuildRequires:	gcc
 BuildRequires:	make
@@ -673,9 +672,7 @@ a device.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 # For debug build default flags may be overriden to disable compiler
@@ -725,6 +722,10 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
 
 
 %changelog
+* Fri Nov  1 2019 Jeff Moyer <jmoyer@redhat.com> - 1.6.1-1.el8
+- Update to pmdk bugfix relase 1.6.1.
+- Resolves: rhbz#1730675
+
 * Mon Jun 24 2019 Jeff Moyer <jmoyer@redhat.com> - 1.6-2.el8
 - Add explicit version dependencies
 - Fix up broken link line in build system