From bb4483a853d65cdec59ae9826cd974b6ad1ba149 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 25 May 2022 17:23:08 +0200 Subject: [PATCH] Update to version 3.2.2; Fixes RHBZ#2078121 --- .gitignore | 1 + ctrlc-fix-metadata.diff | 12 ++++++------ rust-ctrlc.spec | 17 +++++++++-------- sources | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 2481793..de15d3b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /ctrlc-3.1.9.crate /ctrlc-3.2.0.crate /ctrlc-3.2.1.crate +/ctrlc-3.2.2.crate diff --git a/ctrlc-fix-metadata.diff b/ctrlc-fix-metadata.diff index 33138e5..9c6c166 100644 --- a/ctrlc-fix-metadata.diff +++ b/ctrlc-fix-metadata.diff @@ -1,9 +1,9 @@ ---- ctrlc-3.2.1/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ ctrlc-3.2.1/Cargo.toml 2022-01-14T16:32:20.004590+00:00 -@@ -34,9 +34,3 @@ - termination = [] - [target."cfg(unix)".dependencies.nix] - version = "0.23" +--- ctrlc-3.2.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ ctrlc-3.2.2/Cargo.toml 2022-05-25T14:02:14.814780+00:00 +@@ -35,9 +35,3 @@ + version = "0.24" + features = ["fs", "signal"] + default-features = false -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["consoleapi", "handleapi", "synchapi", "winbase"] diff --git a/rust-ctrlc.spec b/rust-ctrlc.spec index e37dfd1..185730a 100644 --- a/rust-ctrlc.spec +++ b/rust-ctrlc.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate ctrlc Name: rust-%{crate} -Version: 3.2.1 +Version: 3.2.2 Release: %autorelease Summary: Easy Ctrl-C handler for Rust projects @@ -19,7 +19,7 @@ Patch0: ctrlc-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Easy Ctrl-C handler for Rust projects.} @@ -36,9 +36,10 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,7 +51,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 %package -n %{name}+termination-devel Summary: %{summary} @@ -62,7 +63,7 @@ This package contains library source intended for building other packages which use the "termination" feature of the "%{crate}" crate. %files -n %{name}+termination-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 d5a279d..5cfc78e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ctrlc-3.2.1.crate) = 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b +SHA512 (ctrlc-3.2.2.crate) = 9536489c3b871685f20eabe7b8fa4a1a4db8e362e8e83b4b2fe244d98eb4da8f84737d26854505cbb53a311e6aab6327b0644689206a19dc5f7d3b88bac580d9