From f64dc1ab5e1b2d2cbc0befe9d7fd7892337b9514 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 25 Jan 2024 21:13:07 +0100 Subject: [PATCH] Update to version 1.8.1; Fixes RHBZ#2258859 --- .gitignore | 1 + rayon-fix-metadata.diff | 21 +++++++++++++++++++++ rust-rayon.spec | 11 +++++++---- sources | 2 +- 4 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 rayon-fix-metadata.diff diff --git a/.gitignore b/.gitignore index cee1684..3876788 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /rayon-1.6.1.crate /rayon-1.7.0.crate /rayon-1.8.0.crate +/rayon-1.8.1.crate diff --git a/rayon-fix-metadata.diff b/rayon-fix-metadata.diff new file mode 100644 index 0000000..1cc2094 --- /dev/null +++ b/rayon-fix-metadata.diff @@ -0,0 +1,21 @@ +--- rayon-1.8.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ rayon-1.8.1/Cargo.toml 2024-01-25T20:08:06.118789+00:00 +@@ -44,18 +44,9 @@ + [dependencies.rayon-core] + version = "1.12.1" + +-[dependencies.wasm_sync] +-version = "0.1.0" +-optional = true +- + [dev-dependencies.rand] + version = "0.8" + + [dev-dependencies.rand_xorshift] + version = "0.3" + +-[features] +-web_spin_lock = [ +- "dep:wasm_sync", +- "rayon-core/web_spin_lock", +-] diff --git a/rust-rayon.spec b/rust-rayon.spec index d421981..08d45a1 100644 --- a/rust-rayon.spec +++ b/rust-rayon.spec @@ -1,19 +1,22 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate rayon Name: rust-rayon -Version: 1.8.0 +Version: 1.8.1 Release: %autorelease Summary: Simple work-stealing parallelism for Rust License: MIT OR Apache-2.0 URL: https://crates.io/crates/rayon Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * remove WASM-specific features and dependencies +Patch: rayon-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Simple work-stealing parallelism for Rust.} @@ -50,7 +53,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 bf7b314..bbbad57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rayon-1.8.0.crate) = ab1cef238530d81c255b6631ecfed9cc4f3f8d7cb6a74701d29c1dcb022cc5b859db1d246cf8247d47702fdadcedfe64a6749e24cf6c7258e8c9411af7e4524a +SHA512 (rayon-1.8.1.crate) = a83304be8334f5aa1c63468ddc749d8e8124c6947f1472320ba0bd4351c9ae582dba31ff369e9efdafdab439571fbf91b497c2370ec15406cfa810f5161cfb32