From 046821ea929588ab8f05bad4ed036d237a67f08e Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Tue, 29 Mar 2022 13:03:17 +0200
Subject: [PATCH] Update to version 0.9.8; Fixes RHBZ#2064278

---
 .gitignore                        |  1 +
 crossbeam-epoch-fix-metadata.diff | 13 ++++++-----
 rust-crossbeam-epoch.spec         | 36 +++++++++++--------------------
 sources                           |  2 +-
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab00017..fff07e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /crossbeam-epoch-0.9.5.crate
 /crossbeam-epoch-0.9.6.crate
 /crossbeam-epoch-0.9.7.crate
+/crossbeam-epoch-0.9.8.crate
diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff
index 5f5dd74..6e1115a 100644
--- a/crossbeam-epoch-fix-metadata.diff
+++ b/crossbeam-epoch-fix-metadata.diff
@@ -1,6 +1,6 @@
---- crossbeam-epoch-0.9.7/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ crossbeam-epoch-0.9.7/Cargo.toml	2022-02-07T23:47:08.269932+00:00
-@@ -58,10 +58,6 @@
+--- crossbeam-epoch-0.9.8/Cargo.toml	1970-01-01T00:00:01+00:00
++++ crossbeam-epoch-0.9.8/Cargo.toml	2022-03-29T11:01:54.567202+00:00
+@@ -60,18 +60,9 @@
  [features]
  alloc = []
  default = ["std"]
@@ -8,10 +8,9 @@
 -    "loom-crate",
 -    "crossbeam-utils/loom",
 -]
- nightly = [
-     "crossbeam-utils/nightly",
-     "const_fn",
-@@ -71,8 +67,3 @@
+ nightly = ["crossbeam-utils/nightly"]
+ std = [
+     "alloc",
      "crossbeam-utils/std",
      "lazy_static",
  ]
diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec
index b3bb050..bc14293 100644
--- a/rust-crossbeam-epoch.spec
+++ b/rust-crossbeam-epoch.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 21
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate crossbeam-epoch
 
 Name:           rust-%{crate}
-Version:        0.9.7
+Version:        0.9.8
 Release:        %autorelease
 Summary:        Epoch-based garbage collection
 
@@ -19,7 +19,7 @@ Patch0:         crossbeam-epoch-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Epoch-based garbage collection.}
@@ -36,9 +36,11 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc CHANGELOG.md README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -50,7 +52,7 @@ This package contains library source intended for building other packages which
 use the "default" feature of the "%{crate}" crate.
 
 %files       -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+alloc-devel
 Summary:        %{summary}
@@ -62,19 +64,7 @@ This package contains library source intended for building other packages which
 use the "alloc" feature of the "%{crate}" crate.
 
 %files       -n %{name}+alloc-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
-
-%package     -n %{name}+const_fn-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+const_fn-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "const_fn" feature of the "%{crate}" crate.
-
-%files       -n %{name}+const_fn-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+lazy_static-devel
 Summary:        %{summary}
@@ -86,7 +76,7 @@ This package contains library source intended for building other packages which
 use the "lazy_static" feature of the "%{crate}" crate.
 
 %files       -n %{name}+lazy_static-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+nightly-devel
 Summary:        %{summary}
@@ -98,7 +88,7 @@ This package contains library source intended for building other packages which
 use the "nightly" feature of the "%{crate}" crate.
 
 %files       -n %{name}+nightly-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+std-devel
 Summary:        %{summary}
@@ -110,7 +100,7 @@ This package contains library source intended for building other packages which
 use the "std" feature of the "%{crate}" crate.
 
 %files       -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 4ed0581..45624a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (crossbeam-epoch-0.9.7.crate) = f6afc55b8624fd3d4f8b0fa5f949360b7e205f7f5be92c248acc102d761e8cd1facac0e40be2f507379c824ce2bfefbf6aea6e8a87eb2ba1c20f928bb9dcc0a9
+SHA512 (crossbeam-epoch-0.9.8.crate) = c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624