From ec823a61c4d4578c99256b0d0944de95d9a3f187 Mon Sep 17 00:00:00 2001
From: Andrew Walsh <awalsh@redhat.com>
Date: Tue, 19 Jul 2022 18:34:05 +0000
Subject: [PATCH] Updated to version 8.2.0.2

Rebased to latest upstream candidate.
- Resolves: rhbz#2071648

Signed-off-by: Andrew Walsh <awalsh@redhat.com>
---
 .gitignore |  1 +
 sources    |  2 +-
 vdo.spec   | 17 +++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 898e2b8..06090dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /vdo-f695290.tar.gz
 /vdo-e3f1b5b.tar.gz
 /vdo-0bbe708.tar.gz
+/vdo-163f9d8.tar.gz
diff --git a/sources b/sources
index 47d1168..8997a50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdo-0bbe708.tar.gz) = b4b26b6910d0e093e246f1ab6a5a640914a671794d9cb07ccd63f40050074f11223f4aa85121d2f52e5e28d59b499c8591e7feb465b4d7b8a0d0e37c7310b114
+SHA512 (vdo-163f9d8.tar.gz) = 853d2451de47111419351c32f39828625874145c762c49f9957047b6c22085bab29d51f4c1c5c92c78e41223c239789e8b457e4b99fbe1278def1d7bbbe36205
diff --git a/vdo.spec b/vdo.spec
index b7558ce..1fef1a7 100644
--- a/vdo.spec
+++ b/vdo.spec
@@ -1,5 +1,5 @@
-%global commit           0bbe70862b691da346536a1dd3e75be47a3514eb
-%global gittag           8.1.1.360
+%global commit           163f9d85ace03428e092b25e251e0388deb5b868
+%global gittag           8.2.0.2
 %global shortcommit      %(c=%{commit}; echo ${c:0:7})
 
 %define spec_release 1
@@ -12,7 +12,7 @@ Source0: https://github.com/dm-vdo/%{name}/archive/%{commit}/%{name}-%{shortcomm
 Patch0:  fix_dmeventd_linking.patch
 URL: http://github.com/dm-vdo/vdo
 # Requires: libuuid >= 2.23
-Requires: kmod-kvdo >= 6.2
+Requires: kmod-kvdo >= 8.2
 # Requires: util-linux >= 2.32.1-7
 Provides: kvdo-kmod-common = %{version}
 ExcludeArch: s390
@@ -63,11 +63,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= bindir=%{_bindir} \
 %dir %{_defaultdocdir}/%{name}
 %license %{_defaultdocdir}/%{name}/COPYING
 %dir %{_defaultdocdir}/%{name}/examples
-%dir %{_defaultdocdir}/%{name}/examples/ansible
-%doc %{_defaultdocdir}/%{name}/examples/ansible/README.txt
-%doc %{_defaultdocdir}/%{name}/examples/ansible/test_vdocreate.yml
-%doc %{_defaultdocdir}/%{name}/examples/ansible/test_vdocreate_alloptions.yml
-%doc %{_defaultdocdir}/%{name}/examples/ansible/test_vdoremove.yml
 %dir %{_defaultdocdir}/%{name}/examples/monitor
 %doc %{_defaultdocdir}/%{name}/examples/monitor/monitor_check_vdostats_logicalSpace.pl
 %doc %{_defaultdocdir}/%{name}/examples/monitor/monitor_check_vdostats_physicalSpace.pl
@@ -98,6 +93,7 @@ This package provides the user-space support tools for VDO.
 %{_bindir}/vdodumpmetadata
 %{_bindir}/vdolistmetadata
 %{_bindir}/vdoreadonly
+%{_bindir}/vdorecover
 %{_bindir}/vdoregenerategeometry
 %{_mandir}/man8/adaptlvm.8.gz
 %{_mandir}/man8/vdoaudit.8.gz
@@ -106,9 +102,14 @@ This package provides the user-space support tools for VDO.
 %{_mandir}/man8/vdodumpmetadata.8.gz
 %{_mandir}/man8/vdolistmetadata.8.gz
 %{_mandir}/man8/vdoreadonly.8.gz
+%{_mandir}/man8/vdorecover.8.gz
 %{_mandir}/man8/vdoregenerategeometry.8.gz
 
 %changelog
+* Tue Jul 19 2022 - Andy Walsh <awalsh@redhat.com> - 8.2.0.2-1
+- Rebased to latest upstream candidate.
+- Resolves: rhbz#2071648
+
 * Sat Feb 12 2022 - Andy Walsh <awalsh@redhat.com> - 8.1.1.360-1
 - Fixed vdostats output issues.
 - Resolves: rhbz#2004576