From 3272f8cc10c8df6db01edc658ff0f539a14e0d56 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 25 Jan 2024 21:09:43 +0100 Subject: [PATCH] Update to version 1.12.1; Fixes RHBZ#2258860 --- .gitignore | 1 + rayon-core-fix-metadata.diff | 22 ++++++++++++++++++++++ rust-rayon-core.spec | 11 +++++++---- sources | 2 +- 4 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 rayon-core-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 29723ae..ff85c76 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /rayon-core-1.10.2.crate /rayon-core-1.11.0.crate /rayon-core-1.12.0.crate +/rayon-core-1.12.1.crate diff --git a/rayon-core-fix-metadata.diff b/rayon-core-fix-metadata.diff new file mode 100644 index 0000000..a63051f --- /dev/null +++ b/rayon-core-fix-metadata.diff @@ -0,0 +1,22 @@ +--- rayon-core-1.12.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ rayon-core-1.12.1/Cargo.toml 2024-01-25T20:07:36.521674+00:00 +@@ -68,10 +68,6 @@ + [dependencies.crossbeam-utils] + version = "0.8.0" + +-[dependencies.wasm_sync] +-version = "0.1.0" +-optional = true +- + [dev-dependencies.rand] + version = "0.8" + +@@ -81,8 +77,5 @@ + [dev-dependencies.scoped-tls] + version = "1.0" + +-[features] +-web_spin_lock = ["dep:wasm_sync"] +- + [target."cfg(unix)".dev-dependencies.libc] + version = "0.2" diff --git a/rust-rayon-core.spec b/rust-rayon-core.spec index 6b127cb..34401df 100644 --- a/rust-rayon-core.spec +++ b/rust-rayon-core.spec @@ -1,19 +1,22 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate rayon-core Name: rust-rayon-core -Version: 1.12.0 +Version: 1.12.1 Release: %autorelease Summary: Core APIs for Rayon License: MIT OR Apache-2.0 URL: https://crates.io/crates/rayon-core Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * remove WASM-specific features and dependencies +Patch: rayon-core-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Core APIs for Rayon.} @@ -48,7 +51,7 @@ use the "default" 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/sources b/sources index bd21b4d..047bd7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rayon-core-1.12.0.crate) = 588fa479c499e1620e25c5818996f0376d3bf526272af6c50a17ca0ccf0f8f67b03a3a665938575a86a8edc1f101a37ab01133b27f904eb5c291bbfc581135b2 +SHA512 (rayon-core-1.12.1.crate) = 33d0297b682f131c50e1eabc3be583211a5abe790301cbca91bf510e43d6714b7564ca39fab7c4bf6f02aa0df6bb394f386a61320f21ddb6bd7aea1372b5e99e