From db2aa29a5247f4797c3d2cebead745ead479552e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 6 Jul 2023 01:23:26 +0200 Subject: [PATCH] Update to version 0.14.0; Fixes RHBZ#2212580 --- .gitignore | 1 + README.md | 3 --- hashbrown-fix-metadata.diff | 45 +++++++++++++++++++++++++++++++++++++ rust-hashbrown.spec | 29 ++++++++++++++++++------ rust2rpm.conf | 8 ------- sources | 2 +- 6 files changed, 69 insertions(+), 19 deletions(-) delete mode 100644 README.md create mode 100644 hashbrown-fix-metadata.diff delete mode 100644 rust2rpm.conf diff --git a/.gitignore b/.gitignore index 39de672..0783136 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /hashbrown-0.12.2.crate /hashbrown-0.12.3.crate /hashbrown-0.13.2.crate +/hashbrown-0.14.0.crate diff --git a/README.md b/README.md deleted file mode 100644 index 9a73b62..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-hashbrown - -The rust-hashbrown package \ No newline at end of file diff --git a/hashbrown-fix-metadata.diff b/hashbrown-fix-metadata.diff new file mode 100644 index 0000000..c380460 --- /dev/null +++ b/hashbrown-fix-metadata.diff @@ -0,0 +1,45 @@ +--- 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 2f0caa9..2359aac 100644 --- a/rust-hashbrown.spec +++ b/rust-hashbrown.spec @@ -1,22 +1,25 @@ -# Generated by rust2rpm 23 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate hashbrown Name: rust-hashbrown -Version: 0.13.2 +Version: 0.14.0 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 %global _description %{expand: -Rust port of Google's SwissTable hash map.} +A Rust port of Google's SwissTable hash map.} %description %{_description} @@ -60,16 +63,16 @@ use the "ahash" feature of the "%{crate}" crate. %files -n %{name}+ahash-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+bumpalo-devel +%package -n %{name}+allocator-api2-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+bumpalo-devel %{_description} +%description -n %{name}+allocator-api2-devel %{_description} This package contains library source intended for building other packages which -use the "bumpalo" feature of the "%{crate}" crate. +use the "allocator-api2" feature of the "%{crate}" crate. -%files -n %{name}+bumpalo-devel +%files -n %{name}+allocator-api2-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+inline-more-devel @@ -108,6 +111,18 @@ use the "rayon" feature of the "%{crate}" crate. %files -n %{name}+rayon-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+rkyv-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rkyv-devel %{_description} + +This package contains library source intended for building other packages which +use the "rkyv" feature of the "%{crate}" crate. + +%files -n %{name}+rkyv-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+serde-devel Summary: %{summary} BuildArch: noarch diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index c1f1fa4..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -unwanted-features = - alloc - compiler_builtins - core - nightly - rustc-dep-of-std - rustc-internal-api diff --git a/sources b/sources index 08b4055..2281f11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashbrown-0.13.2.crate) = 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70 +SHA512 (hashbrown-0.14.0.crate) = f0fbdf81517f59a0b67f792a4097f1131d346b2b4cbda93590749cef7f9f1c9029e0e182f58c23b74d3028f7502c30b9593c1eb4da37f95388d74b14582b8959