From 0db38583744107c53bdb1dd7c642004a13eb2b47 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 27 Dec 2023 21:32:02 +0100 Subject: [PATCH] Update to version 0.9.17; Fixes RHBZ#2254355 --- .gitignore | 1 + crossbeam-epoch-fix-metadata-auto.diff | 10 +++++----- crossbeam-epoch-fix-metadata.diff | 6 +++--- rust-crossbeam-epoch.spec | 12 +++++------- sources | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 3d0ae7a..7671fa5 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /crossbeam-epoch-0.9.13.crate /crossbeam-epoch-0.9.14.crate /crossbeam-epoch-0.9.15.crate +/crossbeam-epoch-0.9.17.crate diff --git a/crossbeam-epoch-fix-metadata-auto.diff b/crossbeam-epoch-fix-metadata-auto.diff index 739d999..3c23167 100644 --- a/crossbeam-epoch-fix-metadata-auto.diff +++ b/crossbeam-epoch-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- crossbeam-epoch-0.9.15/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.15/Cargo.toml 2023-06-23T21:55:27.918694+00:00 -@@ -58,7 +58,6 @@ +--- crossbeam-epoch-0.9.17/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.17/Cargo.toml 2023-12-27T20:28:23.715342+00:00 +@@ -48,7 +48,6 @@ alloc = [] default = ["std"] loom = [ @@ -8,11 +8,11 @@ "crossbeam-utils/loom", ] nightly = ["crossbeam-utils/nightly"] -@@ -67,7 +66,3 @@ +@@ -57,7 +56,3 @@ "crossbeam-utils/std", ] -[target."cfg(crossbeam_loom)".dependencies.loom-crate] --version = "0.5" +-version = "0.7.1" -optional = true -package = "loom" diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff index e847c96..9a7b58a 100644 --- a/crossbeam-epoch-fix-metadata.diff +++ b/crossbeam-epoch-fix-metadata.diff @@ -1,6 +1,6 @@ ---- crossbeam-epoch-0.9.15/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.15/Cargo.toml 2023-06-23T21:55:35.991725+00:00 -@@ -57,9 +57,6 @@ +--- crossbeam-epoch-0.9.17/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.17/Cargo.toml 2023-12-27T20:28:39.797416+00:00 +@@ -47,9 +47,6 @@ [features] alloc = [] default = ["std"] diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec index 3a5de20..d35138e 100644 --- a/rust-crossbeam-epoch.spec +++ b/rust-crossbeam-epoch.spec @@ -1,26 +1,24 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate crossbeam-epoch Name: rust-crossbeam-epoch -Version: 0.9.15 +Version: 0.9.17 Release: %autorelease Summary: Epoch-based garbage collection License: MIT OR Apache-2.0 URL: https://crates.io/crates/crossbeam-epoch Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: crossbeam-epoch-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * drop unstable-only dependency on loom Patch: crossbeam-epoch-fix-metadata.diff -# * remove redundant clone() call to fix builds with Rust 1.73+ -Patch: 0001-Remove-redundant-clone-call-to-fix-builds-with-Rust-.patch -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Epoch-based garbage collection.} @@ -92,7 +90,7 @@ use the "std" 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 f4a5515..803b3c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-epoch-0.9.15.crate) = d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde +SHA512 (crossbeam-epoch-0.9.17.crate) = 9bdeb0415ea26250547ed9f34a8dd4c17f9379e3c56f8f17315e48f9bf63ce1b79c37786ead0f4df026e31b0b5965d181c36839d891c14149529ac42b5cedea4