From 6740e4137abe77cbc69099db90bf32530a8074be Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 21 Dec 2022 13:26:47 +0100 Subject: [PATCH] Update to version 1.0.7; Fixes RHBZ#2011948 --- .gitignore | 1 + predicates-tree-fix-metadata.diff | 7 ++++++ rust-predicates-tree.spec | 36 +++++++++++++++---------------- sources | 2 +- 4 files changed, 26 insertions(+), 20 deletions(-) create mode 100644 predicates-tree-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 659f845..15ff123 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /predicates-tree-1.0.1.crate /predicates-tree-1.0.2.crate /predicates-tree-1.0.3.crate +/predicates-tree-1.0.7.crate diff --git a/predicates-tree-fix-metadata.diff b/predicates-tree-fix-metadata.diff new file mode 100644 index 0000000..4da09ff --- /dev/null +++ b/predicates-tree-fix-metadata.diff @@ -0,0 +1,7 @@ +--- predicates-tree-1.0.7/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ predicates-tree-1.0.7/Cargo.toml 2022-12-21T12:23:42.152211+00:00 +@@ -48,4 +48,3 @@ + + [dev-dependencies.predicates] + version = "2.1" +-features = ["color-auto"] diff --git a/rust-predicates-tree.spec b/rust-predicates-tree.spec index c37f036..9bb2117 100644 --- a/rust-predicates-tree.spec +++ b/rust-predicates-tree.spec @@ -1,25 +1,22 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate predicates-tree -Name: rust-%{crate} -Version: 1.0.3 +Name: rust-predicates-tree +Version: 1.0.7 Release: %autorelease Summary: Render boolean-valued predicate functions results as a tree -# Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/predicates-tree Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * disable unavailable color-auto feature of the predicates dev-dependency +Patch: predicates-tree-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Render boolean-valued predicate functions results as a tree.} @@ -32,13 +29,14 @@ 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 -%{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} @@ -46,11 +44,11 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 945d056..dbc0d9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (predicates-tree-1.0.3.crate) = bcf05c9770d26c8c6407b8103f670cd6bbfa48683c19f37caeb03c11d16a56e5011b329d9af6eb59c930db376b7be2f436e1650b7c15e70817316f6af1163ad9 +SHA512 (predicates-tree-1.0.7.crate) = 0e66884edaa68e5339cae5461beab273d10b0acf9162827b26d6860cdcbaa10cee0412e6bb8191dad84f59d12e01a0684646b66b793b2c9c183244c96c05b6b4