diff --git a/.gitignore b/.gitignore index 1844bef..f182b53 100644 --- a/.gitignore +++ b/.gitignore @@ -55,9 +55,3 @@ /dmpd1012-vendor.tar.gz /v1.1.0.tar.gz /dmpd110-vendor.tar.gz -/v1.2.1.tar.gz -/dmpd121-vendor.tar.gz -/v1.3.0.tar.gz -/dmpd130-vendor.tar.gz -/v1.3.1.tar.gz -/dmpd131-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 new file mode 100644 index 0000000..fec51a3 --- /dev/null +++ b/0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch @@ -0,0 +1,31 @@ +From b0b04e59eb381859f3858120d535cc24059fbc08 Mon Sep 17 00:00:00 2001 +From: Marian Csontos +Date: Thu, 27 Jul 2023 11:37:01 +0200 +Subject: [PATCH] Tweak cargo.toml to work with vendor directory + +Mock works offline, cargo would try to download the files from github. +So cargo vendor has to be run first, and then change the Cargo.toml to +make mock happy. + +(cherry picked from commit 0d5347bd771e960294cd0c2f083d96448613ab9c) +--- + Cargo.toml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 47703bfc..4c605a54 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -34,7 +34,8 @@ quick-xml = "0.36" + rand = "0.8" + rangemap = "1.5" + roaring = "0.10" +-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" +-- +2.46.0 + diff --git a/README.md b/README.md index a81396d..1f4acf9 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,15 @@ In the dist-git directory: 2. Update *Source0* and *Source1* to correct values. 3. Add the tarballs to koji/brew lookaside: - `fedpkg new-sources v$VERSION.tar.gz device-mapper-persistent-data-vendor-$VERSION.tar.gz` +4. You may need to update *0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch* to modify + *Cargo.toml* file. Some dependencies (at the moment only *rio*) are not + using upstream from registry, but a patched version. With unmodified + *Cargo.toml* build would fail as it would try to reach to internet. + - NOTE: This patch **MUST NOT** be present in the upstream source directory + when running `cargo vendor`. + - I apply the patch after step 1, and use `git format-patch HEAD^` to + create the patch and add the patch to dist-git directory afterwards. + - The work to replace dependency on rio is in progress. ## TODO/NOTES diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec index 213bfff..d93a722 100644 --- a/device-mapper-persistent-data.spec +++ b/device-mapper-persistent-data.spec @@ -9,15 +9,16 @@ Summary: Device-mapper Persistent Data Tools Name: device-mapper-persistent-data -Version: 1.3.1 -Release: 1%{?dist}%{?release_suffix} +Version: 1.1.0 +Release: 4%{?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: dmpd131-vendor.tar.gz +Source1: dmpd110-vendor.tar.gz +Patch1: 0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch %if %{defined rhel} BuildRequires: rust-toolset @@ -45,18 +46,6 @@ 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 @@ -131,15 +120,6 @@ echo %{version}-%{release} > VERSION #% {_sbindir}/thin_show_duplicates %changelog -* Tue Dec 02 2025 Marian Csontos - 1.3.1-1 -- Update to latest upstream release 1.3.1. - -* Wed Oct 22 2025 Marian Csontos - 1.3.0-1 -- Update to latest upstream release 1.3.0. - -* Thu Sep 04 2025 Marian Csontos - 1.2.1-1 -- Update to latest upstream release 1.2.1. - * Wed Jul 23 2025 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 4ddfdfb..0d0f396 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (v1.3.1.tar.gz) = ff0758b21b50702568cad88522ee4c2b6b4433cec0a5f5074c9d1791c13e630e5c516601d7a68c51ac34e036091fc82fe831dbe51e6776737571d90ed266878e -SHA512 (dmpd131-vendor.tar.gz) = 0e1b8e501e330b64415c9097c94dfc1f1b43d2900a66258e40b6c8f28c51fd61247d60495f594f14550fb349ed4ad435f8959a8808fea1d363a206c5ead7db1e +SHA512 (v1.1.0.tar.gz) = 8cf3953743334b5a34504695757fa2de5a5fb5bdb8c7aed859995154fc004f52c3ef041558d307a2309c2de8dcdcbd8a0537bd3408fd78c7ff2f641f28944c1e +SHA512 (dmpd110-vendor.tar.gz) = 05c32ade894331eb11239c88d702d20ac463745b51d2c8b71d5aed75ce443ab160d94cd33bdbf021982fe3edc21c630e5bd5dba66d890b352bb6636d09667077