From e0a9e769ae2c3cff8dbe83bfb5fa23741188d1cf Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 27 Jan 2022 00:45:51 +0100 Subject: [PATCH] Update to version 2.0.4; Fixes RHBZ#2039545 --- .gitignore | 1 + assert_cmd-fix-metadata.diff | 16 ++++++++-------- rust-assert_cmd.spec | 21 +++++++++------------ sources | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index ba366e3..07b93b6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /assert_cmd-1.0.5.crate /assert_cmd-1.0.8.crate /assert_cmd-2.0.2.crate +/assert_cmd-2.0.4.crate diff --git a/assert_cmd-fix-metadata.diff b/assert_cmd-fix-metadata.diff index e569ba8..4d1216d 100644 --- a/assert_cmd-fix-metadata.diff +++ b/assert_cmd-fix-metadata.diff @@ -1,17 +1,17 @@ ---- assert_cmd-2.0.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ assert_cmd-2.0.2/Cargo.toml 2021-11-23T14:03:10.862939+00:00 -@@ -57,10 +57,6 @@ +--- assert_cmd-2.0.4/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ assert_cmd-2.0.4/Cargo.toml 2022-01-26T23:42:19.881236+00:00 +@@ -58,10 +58,6 @@ [dependencies.bstr] version = "0.2.14" --[dependencies.concolor-control] --version = "0.0.7" +-[dependencies.concolor] +-version = "0.0.8" -optional = true - [dependencies.doc-comment] version = "0.3" -@@ -78,12 +74,5 @@ +@@ -79,12 +75,5 @@ [dependencies.wait-timeout] version = "0.2.0" @@ -22,5 +22,5 @@ version = "0.5" - -[features] --color = ["yansi", "concolor-control/std", "predicates/color"] --color-auto = ["color", "concolor-control/auto"] +-color = ["yansi", "concolor/std", "predicates/color"] +-color-auto = ["color", "concolor/auto"] diff --git a/rust-assert_cmd.spec b/rust-assert_cmd.spec index 0d3d753..2303579 100644 --- a/rust-assert_cmd.spec +++ b/rust-assert_cmd.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} @@ -8,7 +8,7 @@ %global crate assert_cmd Name: rust-%{crate} -Version: 2.0.2 +Version: 2.0.4 Release: %autorelease Summary: Test CLI Applications @@ -17,13 +17,10 @@ License: MIT or ASL 2.0 URL: https://crates.io/crates/assert_cmd Source: %{crates_source} # Initial patched metadata -# * drop color features with missing dependencies (yansi, concolor-control) +# * drop color features with missing dependencies (yansi, concolor) Patch0: assert_cmd-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -38,12 +35,12 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md CHANGELOG.md +%license LICENSE-APACHE LICENSE-MIT +%doc README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel @@ -52,8 +49,8 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +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 diff --git a/sources b/sources index 100c5ed..12d718e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (assert_cmd-2.0.2.crate) = 346268f1ff00416eb04ce9307bc6261a05edac4a9c10745f428c6a7c35edc7fa8f6b6c8f7fe66befe5b508e60c2763b8bc8acfcefca4b24a9d3e3e1ea85a9935 +SHA512 (assert_cmd-2.0.4.crate) = c389e0210153e9a6ccbba4dbc6a6c7a23533e5fe76e717dbc36415be2adbabfbc0de33a2e6d05e3d70779b7a278580edba400c688c9a6b446403b59a78d93720