Update to upstream release 0.9.0

.gitignore

@@ -33,3 +33,6 @@
 /v0.8.0.tar.gz
 /v0.8.1.tar.gz
 /v0.8.5.tar.gz
+/v0.9.0-rc2.tar.gz
+/device-mapper-persistent-data-0.9.0-rc2-vendor.tar.gz
+/v0.9.0.tar.gz

0001-Update-dependencies.patch

@@ -0,0 +1,25 @@
+From 4a45e1d7eafb83ec9c76f0b3278f4bc7efbdde9d Mon Sep 17 00:00:00 2001
+From: Marian Csontos <mcsontos@redhat.com>
+Date: Tue, 1 Sep 2020 14:55:48 +0200
+Subject: [PATCH] Update dependencies
+
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 892ea4c..93fc807 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -9,7 +9,7 @@ license = "GPL3"
+ anyhow = "1.0"
+ byteorder = "1.3"
+ clap = "2.33"
+-crc32c = "0.4"
++crc32c = "0.5"
+ flate2 = "1.0"
+ fixedbitset = "0.3"
+ libc = "0.2.71"
+-- 
+1.8.3.1
+

README.md

@@ -0,0 +1,24 @@
+# Packaging dmpd
+
+This is mostly regular package except recent addition of rust to used languages.
+
+## rust-tools
+
+To build the rust-tools (`make rust-tools`) one needs:
+
+- rust >= 1.35
+- cargo with vendor subcommand (now upstream, included in latest Fedora and RHEL8)
+
+### cargo vendpr
+
+- run `cargo vendor` in the disrectory with sources
+- run `tar czf device-mapper-persistent-data-vendor-$VERSION.tar.gz ./vendor`
+- copy the file (if version changed) and run the *fedpkg new-sources* command:
+    - `fedpkg new-sources v$VERSION.tar.gz device-mapper-persistent-data-vendor-$VERSION.tar.gz`
+
+## TODO/NOTES
+
+Some of the dependencies may be already packaged by Fedora. Can we instruct *cargo vendor* to include only those which are not provided by Fedora?
+
+*%cargo_install* installs by defualt in */usr/bin* but the package expects */usr/sbin*. For now I run *make install-rust-tools*.
+

device-mapper-persistent-data.spec

@@ -2,18 +2,27 @@
 # Copyright (C) 2011-2017 Red Hat, Inc
 #
 
+#%%global version_suffix -rc2
+%global release_suffix .test2
+
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
-Version: 0.8.5
+Version: 0.9.0
-Release: 4%{?dist}
+Release: 0.2%{?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/thin-provisioning-tools-%%{version}.tar.gz
-Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
+Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}%{version_suffix}.tar.gz
 Patch0: device-mapper-persistent-data-avoid-strip.patch
+Patch1: 0001-Update-dependencies.patch
 
 BuildRequires: autoconf, expat-devel, libaio-devel, libstdc++-devel, boost-devel, gcc-c++
 Requires: expat
+%ifarch %{rust_arches}
+BuildRequires: rust-packaging
+BuildRequires: rust >= 1.35
+BuildRequires: cargo
+%endif
 
 %description
 thin-provisioning-tools contains check,dump,restore,repair,rmap
@@ -24,17 +33,32 @@ 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}%{version_suffix}
+%ifarch %{rust_arches}
+%cargo_prep
+%endif
 %patch0 -p1 -b .avoid_strip
+%patch1 -p1 -b .toml_update
 echo %{version}-%{release} > VERSION
 
+%generate_buildrequires
+%cargo_generate_buildrequires
+
 %build
 autoconf
 %configure --with-optimisation=
 make %{?_smp_mflags} V=
+%ifarch %{rust_arches}
+%cargo_build
+%endif
 
 %install
 make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
+%ifarch %{rust_arches}
+make DESTDIR=%{buildroot} MANDIR=%{_mandir} install-rust-tools
+# cargo_install installs into /usr/bin
+#%%cargo_install
+%endif
 
 %files
 %doc COPYING README.md
@@ -57,6 +81,10 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 %{_mandir}/man8/thin_restore.8.gz
 %{_mandir}/man8/thin_rmap.8.gz
 %{_mandir}/man8/thin_trim.8.gz
+%ifarch %{rust_arches}
+%{_mandir}/man8/thin_metadata_pack.8.gz
+%{_mandir}/man8/thin_metadata_unpack.8.gz
+%endif
 %{_sbindir}/pdata_tools
 %{_sbindir}/cache_check
 %{_sbindir}/cache_dump
@@ -77,9 +105,17 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 %{_sbindir}/thin_restore
 %{_sbindir}/thin_rmap
 %{_sbindir}/thin_trim
+%ifarch %{rust_arches}
+%{_sbindir}/thin_metadata_pack
+%{_sbindir}/thin_metadata_unpack
+%endif
 #% {_sbindir}/thin_show_duplicates
 
 %changelog
+* Tue Sep 01 2020 Marian Csontos <mcsontos@redhat.com> - 0.9.0-0.2
+- Update to latest upstream version
+- New tools thin_metadata_pack and thin_metadata_unpack
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (v0.8.5.tar.gz) = 11e8f6bccaa1d5ccc622a356995f60afa45bba5f4dd80e2fbd7e980963d856a15a32d7b3305e445291936d5207af72fac85d9956680ed7c651383cc57a945451
+SHA512 (v0.9.0.tar.gz) = e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f