From d295f18b541c4376507eb82ff6b55d0a01a3d537 Mon Sep 17 00:00:00 2001
From: Peter Rajnoha <prajnoha@redhat.com>
Date: Mar 09 2017 10:36:39 +0000
Subject: New upstream release v0.7.0-rc2.


---

diff --git a/device-mapper-persistent-data-fix-missing-includes.patch b/device-mapper-persistent-data-fix-missing-includes.patch
new file mode 100644
index 0000000..d0b5e71
--- /dev/null
+++ b/device-mapper-persistent-data-fix-missing-includes.patch
@@ -0,0 +1,15 @@
+ block-cache/io_engine.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/block-cache/io_engine.h b/block-cache/io_engine.h
+index fd902c1..1c1a0e8 100644
+--- a/block-cache/io_engine.h
++++ b/block-cache/io_engine.h
+@@ -7,6 +7,7 @@
+ #include <ctype.h>
+ #include <set>
+ #include <string>
++#include <vector>
+ #include <libaio.h>
+ 
+ //----------------------------------------------------------------
diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec
index 701032e..b521984 100644
--- a/device-mapper-persistent-data.spec
+++ b/device-mapper-persistent-data.spec
@@ -1,19 +1,23 @@
 #
-# Copyright (C) 2011-2016 Red Hat, Inc
+# Copyright (C) 2011-2017 Red Hat, Inc
 #
 
+%define pre_release_upstream -rc2
+%define pre_release rc2
+
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
-Version: 0.6.3
-Release: 3%{?dist}
+Version: 0.7.0
+Release: 0.1.%{pre_release}%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: https://github.com/jthornber/thin-provisioning-tools
-Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-%{version}.tar.gz
+Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-%{version}%{pre_release_upstream}.tar.gz
 # Source1: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
 Patch0: device-mapper-persistent-data-document-clear-needs-check-flag.patch
 Patch1: device-mapper-persistent-data-add-era_restore-and-cache_metadata_size-man-pages.patch
 Patch2: device-mapper-persistent-data-avoid-strip.patch
+Patch3: device-mapper-persistent-data-fix-missing-includes.patch
 
 BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel
 Requires: expat
@@ -27,10 +31,11 @@ are included and era check, dump, restore and invalidate to manage
 snapshot eras
 
 %prep
-%setup -q -n thin-provisioning-tools-%{version}
+%setup -q -n thin-provisioning-tools-%{version}%{pre_release_upstream}
 %patch0 -p1 -b .clear_needs_check_flag
 %patch1 -p1 -b .man_pages
 %patch2 -p1 -b .avoid_strip
+%patch3 -p1 -b .includes
 echo %{version}-%{release} > VERSION
 
 %build
@@ -47,8 +52,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 %doc COPYING README.md
 %{_mandir}/man8/cache_check.8.gz
 %{_mandir}/man8/cache_dump.8.gz
-%{_mandir}/man8/cache_restore.8.gz
 %{_mandir}/man8/cache_repair.8.gz
+%{_mandir}/man8/cache_restore.8.gz
+%{_mandir}/man8/cache_writeback.8.gz
 %{_mandir}/man8/era_check.8.gz
 %{_mandir}/man8/era_dump.8.gz
 %{_mandir}/man8/era_invalidate.8.gz
@@ -57,31 +63,38 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 %{_mandir}/man8/thin_dump.8.gz
 %{_mandir}/man8/thin_ls.8.gz
 %{_mandir}/man8/thin_metadata_size.8.gz
-%{_mandir}/man8/thin_restore.8.gz
 %{_mandir}/man8/thin_repair.8.gz
+%{_mandir}/man8/thin_restore.8.gz
 %{_mandir}/man8/thin_rmap.8.gz
 %{_mandir}/man8/thin_trim.8.gz
 %{_sbindir}/pdata_tools
 %{_sbindir}/cache_check
 %{_sbindir}/cache_dump
 %{_sbindir}/cache_metadata_size
-%{_sbindir}/cache_restore
 %{_sbindir}/cache_repair
+%{_sbindir}/cache_restore
+%{_sbindir}/cache_writeback
 %{_sbindir}/era_check
 %{_sbindir}/era_dump
-%{_sbindir}/era_restore
 %{_sbindir}/era_invalidate
+%{_sbindir}/era_restore
 %{_sbindir}/thin_check
 %{_sbindir}/thin_delta
 %{_sbindir}/thin_dump
 %{_sbindir}/thin_ls
 %{_sbindir}/thin_metadata_size
-%{_sbindir}/thin_restore
 %{_sbindir}/thin_repair
+%{_sbindir}/thin_restore
 %{_sbindir}/thin_rmap
 %{_sbindir}/thin_trim
+%{_sbindir}/thin_show_duplicates
 
 %changelog
+* Thu Mar 09 2017 Peter Rajnoha <prajnoha@redhat.com> - 0.7.0-0.1-rc2
+- Update to latest upstream release including various bug fixes and new features.
+- New thin_show_duplicates command.
+- Add '--skip-mappings' and '--format custom' options to thin_dump.
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild