From 7188a9e98a64b19b0128bfc47ec0099504bb278b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 27 Jul 2022 21:54:20 +0200 Subject: [PATCH] Update to version 0.9.10; Fixes RHBZ#2110073 --- .gitignore | 1 + crossbeam-epoch-fix-metadata-auto.diff | 18 ++++++++++++++++++ crossbeam-epoch-fix-metadata.diff | 21 --------------------- rust-crossbeam-epoch.spec | 14 ++++++-------- rust2rpm.conf | 3 +++ sources | 2 +- 6 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 crossbeam-epoch-fix-metadata-auto.diff delete mode 100644 crossbeam-epoch-fix-metadata.diff create mode 100644 rust2rpm.conf diff --git a/.gitignore b/.gitignore index 0953828..7eb1033 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /crossbeam-epoch-0.9.7.crate /crossbeam-epoch-0.9.8.crate /crossbeam-epoch-0.9.9.crate +/crossbeam-epoch-0.9.10.crate diff --git a/crossbeam-epoch-fix-metadata-auto.diff b/crossbeam-epoch-fix-metadata-auto.diff new file mode 100644 index 0000000..8ad3ec9 --- /dev/null +++ b/crossbeam-epoch-fix-metadata-auto.diff @@ -0,0 +1,18 @@ +--- crossbeam-epoch-0.9.10/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.10/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -62,7 +62,6 @@ + alloc = [] + default = ["std"] + loom = [ +- "loom-crate", + "crossbeam-utils/loom", + ] + nightly = ["crossbeam-utils/nightly"] +@@ -72,7 +71,3 @@ + "once_cell", + ] + +-[target."cfg(crossbeam_loom)".dependencies.loom-crate] +-version = "0.5" +-optional = true +-package = "loom" diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff deleted file mode 100644 index c27b962..0000000 --- a/crossbeam-epoch-fix-metadata.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- crossbeam-epoch-0.9.9/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.9/Cargo.toml 2022-07-15T11:58:09.304321+00:00 -@@ -61,18 +61,9 @@ - [features] - alloc = [] - default = ["std"] --loom = [ -- "loom-crate", -- "crossbeam-utils/loom", --] - nightly = ["crossbeam-utils/nightly"] - std = [ - "alloc", - "crossbeam-utils/std", - "once_cell", - ] -- --[target."cfg(crossbeam_loom)".dependencies.loom-crate] --version = "0.5" --optional = true --package = "loom" diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec index 89bebff..3842489 100644 --- a/rust-crossbeam-epoch.spec +++ b/rust-crossbeam-epoch.spec @@ -1,21 +1,19 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil} %global crate crossbeam-epoch -Name: rust-%{crate} -Version: 0.9.9 +Name: rust-crossbeam-epoch +Version: 0.9.10 Release: %autorelease Summary: Epoch-based garbage collection -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/crossbeam-epoch Source: %{crates_source} -# Initial patched metadata -# * drop unused loom dev-dependency -Patch0: crossbeam-epoch-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: crossbeam-epoch-fix-metadata-auto.diff ExclusiveArch: %{rust_arches} diff --git a/rust2rpm.conf b/rust2rpm.conf new file mode 100644 index 0000000..8b9e845 --- /dev/null +++ b/rust2rpm.conf @@ -0,0 +1,3 @@ +[DEFAULT] +unwanted-features = + loom diff --git a/sources b/sources index a42b38e..c5d534e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-epoch-0.9.9.crate) = d32003cf7bac8690c3d8a2cd9393bf06f2a5da8b6371aff68de28be379a86b5b183b67fa6cf397b1a164379e0b095f4c9e6bc7803e229b3867d2c69cdc235085 +SHA512 (crossbeam-epoch-0.9.10.crate) = c8e103daf27a06798e4cc89c6263c08117ba7cef322421b7f91e6a96137c2fa2371ce9cf31e8d1a752be85f4feea90d4da21f1921a0a0c618c1f66ef67a5bf03