From 9404cc42430431d2bd6c61921a4b58b0daae56fd Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 18 Jan 2023 10:44:10 -0600 Subject: [PATCH] Update to 0.6.3 Signed-off-by: Michel Alexandre Salim --- .gitignore | 1 + below-common-fix-metadata.diff | 21 +++++++++++++++++++++ rust-below-common.spec | 23 ++++++++++++----------- sources | 2 +- 4 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 below-common-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 1d5f0ec..ffa4265 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /below-common-0.4.1.crate /below-common-0.5.0.crate +/below-common-0.6.3.crate diff --git a/below-common-fix-metadata.diff b/below-common-fix-metadata.diff new file mode 100644 index 0000000..2bb35fc --- /dev/null +++ b/below-common-fix-metadata.diff @@ -0,0 +1,21 @@ +--- below-common-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ below-common-0.6.3/Cargo.toml 2023-01-18T16:43:18.137715+00:00 +@@ -35,7 +35,7 @@ + default-features = false + + [dependencies.cursive] +-version = "0.19.0" ++version = "0.20.0" + features = ["crossterm-backend"] + default-features = false + +@@ -53,6 +53,9 @@ + ] + default-features = false + ++[dependencies.regex-syntax] ++version = "0.6" ++ + [dependencies.slog] + version = "2.7" + features = [ diff --git a/rust-below-common.spec b/rust-below-common.spec index 4c1fdce..28a2add 100644 --- a/rust-below-common.spec +++ b/rust-below-common.spec @@ -1,22 +1,23 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate below-common -Name: rust-%{crate} -Version: 0.5.0 +Name: rust-below-common +Version: 0.6.3 Release: %autorelease Summary: Common below code -# Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0 URL: https://crates.io/crates/below-common Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# - bump cursive to 0.20 +# - explicitly require regex-syntax +Patch: below-common-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Common below code.} @@ -33,8 +34,8 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -46,7 +47,7 @@ This package contains library source intended for building other packages which use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 1112e4c..187d3d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (below-common-0.5.0.crate) = 79ce7b05b9ed6de80ce1c7101c135a4f36a72f1fdef4b66c4a814198383385a796bf2d20a1d86a5f965382e3dbce52c0561591b19ac0a003e0a116a2b33b4dd0 +SHA512 (below-common-0.6.3.crate) = b6bf81a39510750ee8ba61f975e8c005cc444605082438a0363860ad3404e74a64fd4f46b3c5c1ef77438bcc16d68bf1f1aaf596e12ae5b820220f9797c0e6a6