From bb5aaccbfa0d099060dda1b3ffb070e9940f8c5f Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 4 Mar 2023 19:11:17 +0100 Subject: [PATCH] Update to version 0.9.14; Fixes RHBZ#2173989 --- .gitignore | 1 + README.md | 3 --- crossbeam-epoch-fix-metadata-auto.diff | 4 ++-- crossbeam-epoch-fix-metadata.diff | 12 ++++++++++++ rust-crossbeam-epoch.spec | 7 +++++-- rust2rpm.conf | 3 --- sources | 2 +- 7 files changed, 21 insertions(+), 11 deletions(-) delete mode 100644 README.md create mode 100644 crossbeam-epoch-fix-metadata.diff delete mode 100644 rust2rpm.conf diff --git a/.gitignore b/.gitignore index 1538f50..78d414e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /crossbeam-epoch-0.9.10.crate /crossbeam-epoch-0.9.11.crate /crossbeam-epoch-0.9.13.crate +/crossbeam-epoch-0.9.14.crate diff --git a/README.md b/README.md deleted file mode 100644 index 02346f2..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-crossbeam-epoch - -The rust-crossbeam-epoch package \ No newline at end of file diff --git a/crossbeam-epoch-fix-metadata-auto.diff b/crossbeam-epoch-fix-metadata-auto.diff index a7bb2bc..f71ebe9 100644 --- a/crossbeam-epoch-fix-metadata-auto.diff +++ b/crossbeam-epoch-fix-metadata-auto.diff @@ -1,5 +1,5 @@ ---- crossbeam-epoch-0.9.13/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ crossbeam-epoch-0.9.13/Cargo.toml 1970-01-01T00:00:01+00:00 +--- crossbeam-epoch-0.9.14/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.14/Cargo.toml 2023-02-28T20:22:53.417152+00:00 @@ -58,7 +58,6 @@ alloc = [] default = ["std"] diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff new file mode 100644 index 0000000..16532e7 --- /dev/null +++ b/crossbeam-epoch-fix-metadata.diff @@ -0,0 +1,12 @@ +--- crossbeam-epoch-0.9.14/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ crossbeam-epoch-0.9.14/Cargo.toml 2023-02-28T20:23:19.446223+00:00 +@@ -57,9 +57,6 @@ + [features] + alloc = [] + default = ["std"] +-loom = [ +- "crossbeam-utils/loom", +-] + nightly = ["crossbeam-utils/nightly"] + std = [ + "alloc", diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec index 17ac5c7..60559a0 100644 --- a/rust-crossbeam-epoch.spec +++ b/rust-crossbeam-epoch.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 23 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate crossbeam-epoch Name: rust-crossbeam-epoch -Version: 0.9.13 +Version: 0.9.14 Release: %autorelease Summary: Epoch-based garbage collection @@ -14,6 +14,9 @@ URL: https://crates.io/crates/crossbeam-epoch Source: %{crates_source} # Automatically generated patch to strip foreign dependencies 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 BuildRequires: rust-packaging >= 21 diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 8b9e845..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -unwanted-features = - loom diff --git a/sources b/sources index a010d6c..f050d73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-epoch-0.9.13.crate) = a4578e0e535f301b73f0332778e79b327bafea6afa43284317fccc49b410118360866a2dea8ac22f2977f309d07c663e5d95fbfa852ab795d414c170ee4e06bf +SHA512 (crossbeam-epoch-0.9.14.crate) = 543cb60cff7c0823733f6ace191b137a04025a2b40fe4fea5eb273772009627fb705aecf742bc59e01367d4c15a14aca73aa2caf7f4b509f4b25947e14fd1e19