From 4bd2bdb71c64ce6e38dcac558835a9886f6b8d58 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 8 Oct 2023 15:58:42 +0200 Subject: [PATCH] Update to version 0.14.1; Fixes RHBZ#2241296 --- .gitignore | 1 + hashbrown-fix-metadata.diff | 45 ------------------------------------- rust-hashbrown.spec | 23 +++++++++++++------ rust2rpm.toml | 9 ++++++++ sources | 2 +- 5 files changed, 27 insertions(+), 53 deletions(-) delete mode 100644 hashbrown-fix-metadata.diff create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index 0783136..4a59fcf 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /hashbrown-0.12.3.crate /hashbrown-0.13.2.crate /hashbrown-0.14.0.crate +/hashbrown-0.14.1.crate diff --git a/hashbrown-fix-metadata.diff b/hashbrown-fix-metadata.diff deleted file mode 100644 index c380460..0000000 --- a/hashbrown-fix-metadata.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- hashbrown-0.14.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ hashbrown-0.14.0/Cargo.toml 2023-07-05T17:51:26.874507+00:00 -@@ -47,25 +47,11 @@ - optional = true - default-features = false - --[dependencies.alloc] --version = "1.0.0" --optional = true --package = "rustc-std-workspace-alloc" -- - [dependencies.allocator-api2] - version = "0.2.9" - features = ["alloc"] - optional = true - default-features = false -- --[dependencies.compiler_builtins] --version = "0.1.2" --optional = true -- --[dependencies.core] --version = "1.0.0" --optional = true --package = "rustc-std-workspace-core" - - [dependencies.rayon] - version = "1.0" -@@ -116,16 +102,4 @@ - "allocator-api2", - ] - inline-more = [] --nightly = [ -- "allocator-api2?/nightly", -- "bumpalo/allocator_api", --] - raw = [] --rustc-dep-of-std = [ -- "nightly", -- "core", -- "compiler_builtins", -- "alloc", -- "rustc-internal-api", --] --rustc-internal-api = [] diff --git a/rust-hashbrown.spec b/rust-hashbrown.spec index 2359aac..d902342 100644 --- a/rust-hashbrown.spec +++ b/rust-hashbrown.spec @@ -1,22 +1,19 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate hashbrown Name: rust-hashbrown -Version: 0.14.0 +Version: 0.14.1 Release: %autorelease Summary: Rust port of Google's SwissTable hash map License: MIT OR Apache-2.0 URL: https://crates.io/crates/hashbrown Source: %{crates_source} -# Manually created patch for downstream crate metadata changes -# * drop dependencies on compiler internals -Patch: hashbrown-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: A Rust port of Google's SwissTable hash map.} @@ -75,6 +72,18 @@ use the "allocator-api2" feature of the "%{crate}" crate. %files -n %{name}+allocator-api2-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+equivalent-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+equivalent-devel %{_description} + +This package contains library source intended for building other packages which +use the "equivalent" feature of the "%{crate}" crate. + +%files -n %{name}+equivalent-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+inline-more-devel Summary: %{summary} BuildArch: noarch @@ -136,7 +145,7 @@ use the "serde" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..6f5748f --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,9 @@ +[features] +hide = [ + "alloc", + "compiler_builtins", + "core", + "nightly", + "rustc-dep-of-std", + "rustc-internal-api", +] diff --git a/sources b/sources index 2281f11..d4cd3e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashbrown-0.14.0.crate) = f0fbdf81517f59a0b67f792a4097f1131d346b2b4cbda93590749cef7f9f1c9029e0e182f58c23b74d3028f7502c30b9593c1eb4da37f95388d74b14582b8959 +SHA512 (hashbrown-0.14.1.crate) = 170bc233c9d23ac7e6d1ec5bc965d19d9018d434abeec19bc9f02c48570eba9db4e26035decd9f874306169d2640cad7be17bbbb78a81c145bb01bda3d51ee9c