From 9e58188f6aa6acf23a8bbf4cf2efea14006f2e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lauzier?= Date: Fri, 17 Dec 2021 14:51:29 -0500 Subject: [PATCH] Update to version 0.4.4; Fixes RHBZ#2033710 --- .gitignore | 1 + fallible_collections-fix-metadata.diff | 11 ------ rust-fallible_collections.spec | 52 +++++++++++++++++--------- sources | 2 +- 4 files changed, 37 insertions(+), 29 deletions(-) delete mode 100644 fallible_collections-fix-metadata.diff diff --git a/.gitignore b/.gitignore index a81c03b..449cce2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /fallible_collections-0.4.2.crate /fallible_collections-0.4.3.crate +/fallible_collections-0.4.4.crate diff --git a/fallible_collections-fix-metadata.diff b/fallible_collections-fix-metadata.diff deleted file mode 100644 index 888a9b0..0000000 --- a/fallible_collections-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- fallible_collections-0.4.3/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ fallible_collections-0.4.3/Cargo.toml 2021-08-11T17:01:22.169479+00:00 -@@ -21,7 +21,7 @@ - license = "MIT/Apache-2.0" - repository = "https://github.com/vcombey/fallible_collections.git" - [dependencies.hashbrown] --version = "0.11.2" -+version = "0.9" - - [features] - std_io = [] diff --git a/rust-fallible_collections.spec b/rust-fallible_collections.spec index 06131a5..56767e9 100644 --- a/rust-fallible_collections.spec +++ b/rust-fallible_collections.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate fallible_collections Name: rust-%{crate} -Version: 0.4.3 +Version: 0.4.4 Release: %autorelease Summary: Crate which adds fallible allocation api to std collections @@ -13,14 +13,8 @@ Summary: Crate which adds fallible allocation api to std collections License: MIT or ASL 2.0 URL: https://crates.io/crates/fallible_collections Source: %{crates_source} -# Initial patched metadata -# Downgrade hashbrown to 0.9 -Patch0: fallible_collections-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -35,11 +29,11 @@ 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 "%{crate}" crate. %files devel -%license LICENSE-MIT LICENSE-APACHE +%license LICENSE-APACHE LICENSE-MIT %doc README.md %{cargo_registry}/%{crate}-%{version_no_tilde}/ @@ -49,20 +43,44 @@ 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 "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+rust_1_57-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rust_1_57-devel %{_description} + +This package contains library source intended for building other packages which +use the "rust_1_57" feature of the "%{crate}" crate. + +%files -n %{name}+rust_1_57-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}+std_io-devel Summary: %{summary} BuildArch: noarch %description -n %{name}+std_io-devel %{_description} -This package contains library source intended for building other packages -which use "std_io" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use "std_io" feature of "%{crate}" crate. %files -n %{name}+std_io-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -73,8 +91,8 @@ BuildArch: noarch %description -n %{name}+unstable-devel %{_description} -This package contains library source intended for building other packages -which use "unstable" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use "unstable" feature of "%{crate}" crate. %files -n %{name}+unstable-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/sources b/sources index 6a20911..4bff5e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fallible_collections-0.4.3.crate) = fa99a89131431a04676f72d44de16eaafa06f37f79ee5ce151ff4afeb4c1548550a68999f9f098b72fda4c39f1d711c605ab0d69b0e54c43086f8578cbd99730 +SHA512 (fallible_collections-0.4.4.crate) = 1d91ee35dac5de7d80a57c30342f60cc99b5e5109a93c4b86d97eef99d96855282ad1756c3d65f9a275c0ee6e596d1eb589bd9f3c53135f3b4dbcea57cce1424