From cc61f759e4c70fa34bcfe69c4741674539a19d54 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 17 Dec 2021 14:52:10 +0100 Subject: [PATCH] Update to version 1.0.0; Fixes RHBZ#2008500 --- .gitignore | 3 ++ pretty_assertions-fix-metadata.diff | 16 ++++---- rust-pretty_assertions.spec | 57 ++++++++++++++++++++++++----- sources | 4 +- 4 files changed, 60 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 4400bce..3498d29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /pretty_assertions-0.5.1.crate /pretty_assertions-0.6.1.crate /pretty_assertions-0.7.2.crate +/pretty_assertions-1.0.0.crate +/LICENSE-APACHE +/LICENSE-MIT diff --git a/pretty_assertions-fix-metadata.diff b/pretty_assertions-fix-metadata.diff index 4a6100b..21846e8 100644 --- a/pretty_assertions-fix-metadata.diff +++ b/pretty_assertions-fix-metadata.diff @@ -1,13 +1,11 @@ ---- pretty_assertions-0.7.2/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ pretty_assertions-0.7.2/Cargo.toml 2021-04-20T20:52:50.928646+00:00 -@@ -27,10 +27,6 @@ - - [dependencies.diff] - version = "0.1.12" +--- 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 +@@ -32,8 +32,3 @@ + default = ["std"] + std = [] + unstable = [] -[target."cfg(windows)".dependencies.ctor] -version = "0.1.9" - +- -[target."cfg(windows)".dependencies.output_vt100] -version = "0.1.2" - [badges.travis-ci] - repository = "colin-kiegel/rust-pretty-assertions" diff --git a/rust-pretty_assertions.spec b/rust-pretty_assertions.spec index 85a02d7..0aa054c 100644 --- a/rust-pretty_assertions.spec +++ b/rust-pretty_assertions.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate pretty_assertions Name: rust-%{crate} -Version: 0.7.2 +Version: 1.0.0 Release: %autorelease Summary: Overwrite assert_eq! and assert_ne! with colorful replacements @@ -13,14 +13,14 @@ Summary: Overwrite assert_eq! and assert_ne! with colorful replacements 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 ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -36,12 +36,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-APACHE LICENSE-MIT -%doc README.md CHANGELOG.md +%doc README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel @@ -50,15 +50,52 @@ 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 +%package -n %{name}+alloc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+alloc-devel %{_description} + +This package contains library source intended for building other packages which +use the "alloc" feature of the "%{crate}" crate. + +%files -n %{name}+alloc-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+std-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+std-devel %{_description} + +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. + +%files -n %{name}+std-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + +%package -n %{name}+unstable-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+unstable-devel %{_description} + +This package contains library source intended for building other packages which +use the "unstable" feature of the "%{crate}" crate. + +%files -n %{name}+unstable-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %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 d6f95ed..33b7c1b 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (pretty_assertions-0.7.2.crate) = edf898bbb15f4f56d2d7688d90d44d0ee7913b7d78b4774548eb7a88e8f75b0de9635c93b107744a2501839202ecf828004d179c6edf84706ae160186d47d177 +SHA512 (pretty_assertions-1.0.0.crate) = 65065b7efc5e7003499063464e4b996c84f22637143a01f8857552369960425156e0ce0571a62e876df3a8ac9d1361548bf5d4676749b0baf5bdd3a22f66b1a5 +SHA512 (LICENSE-APACHE) = 3069af3e0a19d4c47ebcfe37327b059d1862b60a780a34b9bcd2c42b304efbe6d3ed321cbd1ffbdeabc83537f0cb8b4adeeeaaa262bb745770a5ca671519c52d +SHA512 (LICENSE-MIT) = 9ed1221057181cdfc0819d60a557b603d920a3a652961fb46e5147c47dafb791facae4b12fb0272a3288d46a661a1f1e3904278343e11a3959a7082eb3a9ec30