From b0a611ca94ab553f22f9b52eec00201d9dad2723 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 3 Feb 2022 12:09:27 +0100 Subject: [PATCH] Update to version 1.1.0; Fixes RHBZ#2049049 --- .gitignore | 1 + pretty_assertions-fix-metadata.diff | 4 ++-- rust-pretty_assertions.spec | 8 ++------ sources | 4 +--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 3498d29..c114aa3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pretty_assertions-1.0.0.crate /LICENSE-APACHE /LICENSE-MIT +/pretty_assertions-1.1.0.crate diff --git a/pretty_assertions-fix-metadata.diff b/pretty_assertions-fix-metadata.diff index 21846e8..3a2772f 100644 --- a/pretty_assertions-fix-metadata.diff +++ b/pretty_assertions-fix-metadata.diff @@ -1,5 +1,5 @@ ---- pretty_assertions-1.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ pretty_assertions-1.0.0/Cargo.toml 2021-12-16T14:09:06.579669+00:00 +--- pretty_assertions-1.1.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ pretty_assertions-1.1.0/Cargo.toml 2022-02-03T11:07:25.759586+00:00 @@ -32,8 +32,3 @@ default = ["std"] std = [] diff --git a/rust-pretty_assertions.spec b/rust-pretty_assertions.spec index 0aa054c..2646994 100644 --- a/rust-pretty_assertions.spec +++ b/rust-pretty_assertions.spec @@ -5,17 +5,14 @@ %global crate pretty_assertions Name: rust-%{crate} -Version: 1.0.0 +Version: 1.1.0 Release: %autorelease Summary: Overwrite assert_eq! and assert_ne! with colorful replacements -# Upstream license specification: MIT/Apache-2.0 +# Upstream license specification: MIT OR Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/pretty_assertions Source: %{crates_source} -# https://github.com/colin-kiegel/rust-pretty-assertions/issues/86 -Source1: https://github.com/colin-kiegel/rust-pretty-assertions/raw/v1.0.0/LICENSE-APACHE -Source2: https://github.com/colin-kiegel/rust-pretty-assertions/raw/v1.0.0/LICENSE-MIT # Initial patched metadata # * drop windows-specific dependencies Patch0: pretty_assertions-fix-metadata.diff @@ -95,7 +92,6 @@ use the "unstable" feature of the "%{crate}" crate. %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep -cp -pav %{SOURCE1} %{SOURCE2} . %generate_buildrequires %cargo_generate_buildrequires diff --git a/sources b/sources index 33b7c1b..fb8d030 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (pretty_assertions-1.0.0.crate) = 65065b7efc5e7003499063464e4b996c84f22637143a01f8857552369960425156e0ce0571a62e876df3a8ac9d1361548bf5d4676749b0baf5bdd3a22f66b1a5 -SHA512 (LICENSE-APACHE) = 3069af3e0a19d4c47ebcfe37327b059d1862b60a780a34b9bcd2c42b304efbe6d3ed321cbd1ffbdeabc83537f0cb8b4adeeeaaa262bb745770a5ca671519c52d -SHA512 (LICENSE-MIT) = 9ed1221057181cdfc0819d60a557b603d920a3a652961fb46e5147c47dafb791facae4b12fb0272a3288d46a661a1f1e3904278343e11a3959a7082eb3a9ec30 +SHA512 (pretty_assertions-1.1.0.crate) = 76c9b6170293bd244bb674852d5a71b46a3560ba6fd53dbdc615516e98aed55d478e8ffb2eed8b7f8b03231b640c96c8a683e01cad19ed16ec72ff5e060bd968