From 6e755274167a3b1d286cd794a9508486b11c637c Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Thu, 4 Sep 2025 15:46:21 +0200
Subject: [PATCH] Update to version 1.2.1

---
 .gitignore                                    |  2 ++
 ...o.toml-to-work-with-vendor-directory.patch | 22 +++++++++----------
 device-mapper-persistent-data.spec            | 21 +++++++++++++++---
 sources                                       |  4 ++--
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f182b53..b493c9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@
 /dmpd1012-vendor.tar.gz
 /v1.1.0.tar.gz
 /dmpd110-vendor.tar.gz
+/v1.2.1.tar.gz
+/dmpd121-vendor.tar.gz
diff --git a/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch b/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
index fec51a3..1d96b49 100644
--- a/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
+++ b/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
@@ -1,6 +1,6 @@
-From b0b04e59eb381859f3858120d535cc24059fbc08 Mon Sep 17 00:00:00 2001
+From 954a2fd73edd2b07543c37143be7cce5ba4f5459 Mon Sep 17 00:00:00 2001
 From: Marian Csontos <mcsontos@redhat.com>
-Date: Thu, 27 Jul 2023 11:37:01 +0200
+Date: Thu, 4 Sep 2025 11:16:06 +0200
 Subject: [PATCH] Tweak cargo.toml to work with vendor directory
 
 Mock works offline, cargo would try to download the files from github.
@@ -13,19 +13,19 @@ make mock happy.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 47703bfc..4c605a54 100644
+index 7924643f..227ebc06 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -34,7 +34,8 @@ quick-xml = "0.36"
- rand = "0.8"
- rangemap = "1.5"
- roaring = "0.10"
+@@ -33,7 +33,8 @@ quick-xml = "0.38"
+ rand = "0.9"
+ rangemap = "1.6"
+ roaring = "0.11"
 -rio = { git = "https://github.com/jthornber/rio", branch = "master", optional = true }
 +#rio = { git = "https://github.com/jthornber/rio", branch = "master", optional = true }
 +rio = { version = "0.9.4", optional = true }
- safemem = "0.3"
- threadpool = "1.8"
- thiserror = "1.0"
+ thiserror = "2.0"
+ tui = { version = "0.19", default-features = false, features = [
+   "termion",
 -- 
-2.46.0
+2.51.0
 
diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec
index d93a722..078e982 100644
--- a/device-mapper-persistent-data.spec
+++ b/device-mapper-persistent-data.spec
@@ -9,15 +9,15 @@
 
 Summary: Device-mapper Persistent Data Tools
 Name: device-mapper-persistent-data
-Version: 1.1.0
-Release: 4%{?dist}%{?release_suffix}
+Version: 1.2.1
+Release: 1%{?dist}%{?release_suffix}
 License: GPL-3.0-only AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
 
 #ExcludeArch: %%{ix86}
 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
-Source1: dmpd110-vendor.tar.gz
+Source1: dmpd121-vendor.tar.gz
 Patch1: 0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
 
 %if %{defined rhel}
@@ -46,6 +46,18 @@ snapshot eras
 %prep
 %autosetup -p1 -n thin-provisioning-tools-%{version}%{?version_suffix} -a1
 %cargo_prep -v vendor
+
+# NOTE: Following could replace Cargo.toml patching, but some macros are not working well with it
+# Notably at least one of cargo_license_summary, cargo_license_summary, or cargo_vendor_manifest
+#cat >> .cargo/config.toml << EOF
+#
+#[source."git+https://github.com/jthornber/rio?branch=master"]
+#git = "https://github.com/jthornber/rio"
+#branch = "master"
+#replace-with = "vendored-sources"
+#
+#EOF
+
 echo %{version}-%{release} > VERSION
 
 %generate_buildrequires
@@ -120,6 +132,9 @@ echo %{version}-%{release} > VERSION
 #% {_sbindir}/thin_show_duplicates
 
 %changelog
+* Thu Sep 04 2025 Marian Csontos <mcsontos@redhat.com> - 1.2.1-1
+- Update to latest upstream release 1.2.1.
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/sources b/sources
index 0d0f396..eb39fed 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v1.1.0.tar.gz) = 8cf3953743334b5a34504695757fa2de5a5fb5bdb8c7aed859995154fc004f52c3ef041558d307a2309c2de8dcdcbd8a0537bd3408fd78c7ff2f641f28944c1e
-SHA512 (dmpd110-vendor.tar.gz) = 05c32ade894331eb11239c88d702d20ac463745b51d2c8b71d5aed75ce443ab160d94cd33bdbf021982fe3edc21c630e5bd5dba66d890b352bb6636d09667077
+SHA512 (v1.2.1.tar.gz) = cc96f8d4b32eb3f905e24db3ba9d291436effdea1c468c1f2292da20fdd8438058552314b5802450f62af414fb338cadff06b37c927f2272b8e34d3704a6a59b
+SHA512 (dmpd121-vendor.tar.gz) = 999395721d94f35f459faf855ca718e5746f72989ca532aa85174b3d7d86ba31779718034248cabba708e12f4ef26747970d3ca8a4326eb19012287377aab969