Update to version 1.3.0
This commit is contained in:
parent
6e75527416
commit
af8fbf5a50
5 changed files with 9 additions and 45 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -57,3 +57,5 @@
|
|||
/dmpd110-vendor.tar.gz
|
||||
/v1.2.1.tar.gz
|
||||
/dmpd121-vendor.tar.gz
|
||||
/v1.3.0.tar.gz
|
||||
/dmpd130-vendor.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
From 954a2fd73edd2b07543c37143be7cce5ba4f5459 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Csontos <mcsontos@redhat.com>
|
||||
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.
|
||||
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 7924643f..227ebc06 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -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 }
|
||||
thiserror = "2.0"
|
||||
tui = { version = "0.19", default-features = false, features = [
|
||||
"termion",
|
||||
--
|
||||
2.51.0
|
||||
|
||||
|
|
@ -42,15 +42,6 @@ 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
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
Summary: Device-mapper Persistent Data Tools
|
||||
Name: device-mapper-persistent-data
|
||||
Version: 1.2.1
|
||||
Version: 1.3.0
|
||||
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)
|
||||
|
||||
|
|
@ -17,8 +17,7 @@ License: GPL-3.0-only AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache
|
|||
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: dmpd121-vendor.tar.gz
|
||||
Patch1: 0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
|
||||
Source1: dmpd130-vendor.tar.gz
|
||||
|
||||
%if %{defined rhel}
|
||||
BuildRequires: rust-toolset
|
||||
|
|
@ -132,6 +131,9 @@ echo %{version}-%{release} > VERSION
|
|||
#% {_sbindir}/thin_show_duplicates
|
||||
|
||||
%changelog
|
||||
* Wed Oct 22 2025 Marian Csontos <mcsontos@redhat.com> - 1.3.0-1
|
||||
- Update to latest upstream release 1.3.0.
|
||||
|
||||
* Thu Sep 04 2025 Marian Csontos <mcsontos@redhat.com> - 1.2.1-1
|
||||
- Update to latest upstream release 1.2.1.
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (v1.2.1.tar.gz) = cc96f8d4b32eb3f905e24db3ba9d291436effdea1c468c1f2292da20fdd8438058552314b5802450f62af414fb338cadff06b37c927f2272b8e34d3704a6a59b
|
||||
SHA512 (dmpd121-vendor.tar.gz) = 999395721d94f35f459faf855ca718e5746f72989ca532aa85174b3d7d86ba31779718034248cabba708e12f4ef26747970d3ca8a4326eb19012287377aab969
|
||||
SHA512 (v1.3.0.tar.gz) = 84e364df240a43fea44edfe14cf428d79d1301891b2482599229e125768912127922377139c2117db50a5370fb08c0f52d589d11b6a90673af2d242ff4ef7920
|
||||
SHA512 (dmpd130-vendor.tar.gz) = 9f5e7e68da29189f74dfae5d8c219917b3e11fe73e9f978fec22d3003734a6fff2df6fb1a83c84a666726ba473f611aabd2ecf77ff859c0b3be85dc48a6dcf21
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue