From 17d784aa7f2421481f493b0dc88f4155167ad1bb Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 17 Sep 2020 17:21:56 +0200
Subject: [PATCH] Update to ustrream release 0.9.0

---
 .gitignore                         |  1 +
 device-mapper-persistent-data.spec | 29 ++++++++++++++++++++---------
 sources                            |  1 +
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15172ca..a2c13b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /v0.9.0-rc2.tar.gz
 /device-mapper-persistent-data-0.9.0-rc2-vendor.tar.gz
 /v0.9.0.tar.gz
+/dmpd090-vendor.tar.gz
diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec
index 2878e32..4eb06e1 100644
--- a/device-mapper-persistent-data.spec
+++ b/device-mapper-persistent-data.spec
@@ -3,18 +3,19 @@
 #
 
 #%%global version_suffix -rc2
-%global release_suffix .test2
+#%%global release_suffix .test3
 
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
 Version: 0.9.0
-Release: 0.2%{?dist}%{?release_suffix}
+Release: 1%{?dist}%{?release_suffix}
 License: GPLv3+
 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/v%{version}%{version_suffix}.tar.gz
+Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}%{?version_suffix}.tar.gz
+Source1: dmpd090-vendor.tar.gz
 Patch0: device-mapper-persistent-data-avoid-strip.patch
-Patch1: 0001-Update-dependencies.patch
+#Patch1: 0001-Update-dependencies.patch
 
 BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel, gcc-c++
 Requires: expat
@@ -33,16 +34,26 @@ are included and era check, dump, restore and invalidate to manage
 snapshot eras
 
 %prep
-%setup -q -n thin-provisioning-tools-%{version}%{version_suffix}
+%setup -q -n thin-provisioning-tools-%{version}%{?version_suffix}
 %ifarch %{rust_arches}
-%cargo_prep
+#%%patch1 -p1 -b .toml_update
+#%%cargo_prep
+#%%cargo_generate_buildrequires
+tar xf %{SOURCE1}
+mkdir -p .cargo
+cat > .cargo/config <<END
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+
+END
 %endif
 %patch0 -p1 -b .avoid_strip
-%patch1 -p1 -b .toml_update
 echo %{version}-%{release} > VERSION
 
 %generate_buildrequires
-%cargo_generate_buildrequires
 
 %build
 autoconf
@@ -112,7 +123,7 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install-rust-tools
 #% {_sbindir}/thin_show_duplicates
 
 %changelog
-* Tue Sep 01 2020 Marian Csontos <mcsontos@redhat.com> - 0.9.0-0.2
+* Thu Sep 17 2020 Marian Csontos <mcsontos@redhat.com> - 0.9.0-1
 - Update to latest upstream version
 - New tools thin_metadata_pack and thin_metadata_unpack
 
diff --git a/sources b/sources
index 1219fce..f0a209b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (v0.9.0.tar.gz) = e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f
+SHA512 (dmpd090-vendor.tar.gz) = fb455511b9a7cba22029f968e9caac14cb0c94f899fea7cb96b973f8abf9cfc26f9706f0b18e4750edda063d7014c485583f559f127f1296ecd3b0b9f5d912e3