From 2342b7440fc9f6452f6de36ce086c7b73f1694c5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 28 2020 08:49:10 +0000
Subject: import pmdk-convert-1.7-1.el8


---

diff --git a/.gitignore b/.gitignore
index a61486e..a99581f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 SOURCES/nvml-1.0.tar.gz
 SOURCES/nvml-1.1.tar.gz
-SOURCES/nvml-1.2.3.tar.gz
-SOURCES/nvml-1.3.1.tar.gz
-SOURCES/nvml-1.4.2.tar.gz
-SOURCES/nvml-1.5.1.tar.gz
-SOURCES/pmdk-convert-1.5.1.tar.gz
+SOURCES/pmdk-1.2.4.tar.gz
+SOURCES/pmdk-1.3.3.tar.gz
+SOURCES/pmdk-1.4.3.tar.gz
+SOURCES/pmdk-1.5.2.tar.gz
+SOURCES/pmdk-1.6.1.tar.gz
+SOURCES/pmdk-1.7.tar.gz
+SOURCES/pmdk-convert-1.7.tar.gz
diff --git a/.pmdk-convert.metadata b/.pmdk-convert.metadata
index 6391269..e0425f9 100644
--- a/.pmdk-convert.metadata
+++ b/.pmdk-convert.metadata
@@ -1,7 +1,9 @@
 68c1210355d26b2b1ee2b21050bde3891f63172a SOURCES/nvml-1.0.tar.gz
 5a0727b90f620b20d8f507359bcb91ee22315937 SOURCES/nvml-1.1.tar.gz
-56afc47af93d8bc64c7e03ff71830f5dd7012957 SOURCES/nvml-1.2.3.tar.gz
-8856bd67ff6a7ac2fdc7f889b1aa2962add98ce7 SOURCES/nvml-1.3.1.tar.gz
-fdfc7cbc24552e35b6712bbb02b0db007fedba26 SOURCES/nvml-1.4.2.tar.gz
-00855536964320fd623eafcdde2437256f541c36 SOURCES/nvml-1.5.1.tar.gz
-5a6a74ceb331c364833f4230b39f9beaa329b110 SOURCES/pmdk-convert-1.5.1.tar.gz
+d7e4465fbfa22cb1f8053e32e9613688b812c3e9 SOURCES/pmdk-1.2.4.tar.gz
+c7068d0fc7e0392b2c012a213bb94a17431cb1c7 SOURCES/pmdk-1.3.3.tar.gz
+adc3e774757038bd032c472c5ad803c9d82d8e09 SOURCES/pmdk-1.4.3.tar.gz
+76fd981b578fd75652dcbfbf758a2958b64a377f SOURCES/pmdk-1.5.2.tar.gz
+c09c4ee03c00339483d27b578b52ab02f5b246b8 SOURCES/pmdk-1.6.1.tar.gz
+0fbe664d76177ee07b8bc02a4297184066b57f7a SOURCES/pmdk-1.7.tar.gz
+9feb3ea74c78f5152a989a225021bfdfcd4319bb SOURCES/pmdk-convert-1.7.tar.gz
diff --git a/SPECS/pmdk-convert.spec b/SPECS/pmdk-convert.spec
index b0ce2f3..b8cda11 100644
--- a/SPECS/pmdk-convert.spec
+++ b/SPECS/pmdk-convert.spec
@@ -1,24 +1,25 @@
-%global upstreamversion 1.5.1
-
 Name:		pmdk-convert
-Version:	1.5.1
-Release:	2%{?dist}
+Version:	1.7
+Release:	1%{?dist}
 Summary:	Conversion tool for PMDK pools
 # Note: utils/cstyle is CDDL licensed. It's only used during development and it's NOT part of the binary RPM.
 License:	BSD
 URL:		https://github.com/pmem/pmdk-convert
 
-Source0:	https://github.com/pmem/%{name}/archive/%{upstreamversion}.tar.gz#/%{name}-%{upstreamversion}.tar.gz
+Source0:	https://github.com/pmem/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:	https://github.com/pmem/pmdk/archive/1.0.tar.gz#/nvml-1.0.tar.gz
 Source2:	https://github.com/pmem/pmdk/archive/1.1.tar.gz#/nvml-1.1.tar.gz
-Source3:	https://github.com/pmem/pmdk/archive/1.2.3.tar.gz#/nvml-1.2.3.tar.gz
-Source4:	https://github.com/pmem/pmdk/archive/1.3.1.tar.gz#/nvml-1.3.1.tar.gz
-Source5:	https://github.com/pmem/pmdk/archive/1.4.2.tar.gz#/nvml-1.4.2.tar.gz
-Source6:	https://github.com/pmem/pmdk/archive/1.5.1.tar.gz#/nvml-1.5.1.tar.gz
+Source3:	https://github.com/pmem/pmdk/releases/download/1.2.4/pmdk-1.2.4.tar.gz
+Source4:	https://github.com/pmem/pmdk/releases/download/1.3.3/pmdk-1.3.3.tar.gz
+Source5:	https://github.com/pmem/pmdk/releases/download/1.4.3/pmdk-1.4.3.tar.gz
+Source6:	https://github.com/pmem/pmdk/releases/download/1.5.2/pmdk-1.5.2.tar.gz
+Source7:	https://github.com/pmem/pmdk/releases/download/1.6.1/pmdk-1.6.1.tar.gz
+Source8:	https://github.com/pmem/pmdk/releases/download/1.7/pmdk-1.7.tar.gz
 
 BuildRequires:	cmake >= 3.3
 BuildRequires:	glibc-devel
 BuildRequires:	gcc
+BuildRequires:	gcc-c++
 BuildRequires:	gdb
 
 # PMDK is currently available only on x86_64
@@ -39,6 +40,7 @@ conversion and this tool supports only those kind of pools.
 %{_libdir}/pmdk-convert/pmemobj_convert_v3.so
 %{_libdir}/pmdk-convert/pmemobj_convert_v4.so
 %{_libdir}/pmdk-convert/pmemobj_convert_v5.so
+%{_libdir}/pmdk-convert/pmemobj_convert_v6.so
 
 %license LICENSE
 
@@ -46,12 +48,14 @@ conversion and this tool supports only those kind of pools.
 
 %prep
 %setup -q
-cp %{S:1} .
-cp %{S:2} .
-cp %{S:3} .
-cp %{S:4} .
-cp %{S:5} .
-cp %{S:6} .
+cp %{S:1} 1.0.tar.gz
+cp %{S:2} 1.1.tar.gz
+cp %{S:3} 1.2.4.tar.gz
+cp %{S:4} 1.3.3.tar.gz
+cp %{S:5} 1.4.3.tar.gz
+cp %{S:6} 1.5.2.tar.gz
+cp %{S:7} 1.6.1.tar.gz
+cp %{S:8} 1.7.tar.gz
 
 %build
 mkdir build
@@ -73,6 +77,10 @@ ctest -V
 %endif
 
 %changelog
+* Mon Nov  4 2019 Jeff Moyer <jmoyer@redhat.com> - 1.7-1.el7
+- Update to version 1.7
+- Resolves: rhbz#1768626
+
 * Wed Jun 19 2019 Jeff Moyer <jmoyer@redhat.com> - 1.5.1-2.el8
 - Bump release number and re-build to trigger gating tests
 - Related: rhbz#1659658