From ba900b6d9b12f7f4618df4034b19aaa5f63b25fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Tue, 14 Aug 2018 11:39:59 +0200
Subject: [PATCH] PMDK 1.4.2-rc1 release

---
 .gitignore |  2 ++
 nvml.spec  | 24 ++++++++++++++----------
 sources    |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index f9e5c64..db42c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /nvml-1.3.1.tar.gz
 /pmdk-1.4.tar.gz
 /nvml-1.4.tar.gz
+/pmdk-1.4.1.tar.gz
+/pmdk-1.4.2-rc1.tar.gz
diff --git a/nvml.spec b/nvml.spec
index 8b95825..19d91d2 100644
--- a/nvml.spec
+++ b/nvml.spec
@@ -20,20 +20,21 @@
 %bcond_with fabric
 %endif
 
-# by default build w/o ndctl, unless explicitly enabled
-%bcond_with ndctl
+# by default build with ndctl, unless explicitly disabled
+%bcond_without ndctl
 
 %define min_libfabric_ver 1.4.2
-%define min_ndctl_ver 59.2
+%define min_ndctl_ver 60.1
+%define upstreamversion 1.4.2-rc1
 
-Name:		nvml
-Version:	1.4
-Release:	4%{?dist}
-Summary:	Persistent Memory Development Kit (former NVML)
+Name:		pmdk
+Version:	1.4.2
+Release:	0.1.rc1%{?dist}
+Summary:	Persistent Memory Development Kit (formerly NVML)
 License:	BSD
 URL:		http://pmem.io/pmdk
 
-Source0:	https://github.com/pmem/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:	https://github.com/pmem/%{name}/archive/%{upstreamversion}.tar.gz#/%{name}-%{upstreamversion}.tar.gz
 
 BuildRequires:	gcc
 BuildRequires:	make
@@ -686,7 +687,7 @@ and users of the applications based on PMDK libraries.
 %{_bindir}/pmempool
 %{_mandir}/man1/pmempool.1.gz
 %{_mandir}/man1/pmempool-*.1.gz
-%config(noreplace) %{_sysconfdir}/bash_completion.d/pmempool.sh
+%config(noreplace) %{_sysconfdir}/bash_completion.d/pmempool
 %license LICENSE
 %doc ChangeLog CONTRIBUTING.md README.md
 
@@ -715,7 +716,7 @@ a device.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{upstreamversion}
 
 
 %build
@@ -784,6 +785,9 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
 
 
 %changelog
+* Mon Aug 14 2018 Marcin Ślusarz <marcin.slusarz@intel.com> - 1.4.2-0.1.rc1
+- Update to PMDK version 1.4.2-rc1 (RHBZ #1589406)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index f7c359f..a3619d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvml-1.4.tar.gz) = 80065f954383ff75091ded14b17e32019ade6bbac9d5cd634331516d8253a0cf1689335a1a9e418e42a34e01d162bff7f76f96ae488115d9016a91d34f6fda5c
+SHA512 (pmdk-1.4.2-rc1.tar.gz) = 4dbbef9331ff1aa891332415cb22d15c7e0f3605f9a6b7e09210629d6a99efe941e072330e3bac768a3d181348af42a305dfe5571f9f1c220008af96847440e9