From 2a24a4f59629aa22e93399c4392344fce5b01473 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 7 May 2019 07:30:42 +0200
Subject: [PATCH] Update scopeguard to 1

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 crossbeam-epoch-fix-metadata.diff | 18 ++++++++++--------
 rust-crossbeam-epoch.spec         | 24 +++++++++++++++++++-----
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/crossbeam-epoch-fix-metadata.diff b/crossbeam-epoch-fix-metadata.diff
index fc8e3ef..a1bbb75 100644
--- a/crossbeam-epoch-fix-metadata.diff
+++ b/crossbeam-epoch-fix-metadata.diff
@@ -1,9 +1,11 @@
---- crossbeam-epoch-0.7.0/Cargo.toml	1969-12-31T16:00:00-08:00
-+++ crossbeam-epoch-0.7.0/Cargo.toml	2019-01-07T16:22:00.353462-08:00
-@@ -48,6 +48,5 @@
+--- crossbeam-epoch-0.7.1/Cargo.toml	1970-01-01T00:00:00+00:00
++++ crossbeam-epoch-0.7.1/Cargo.toml	2019-05-07T05:29:42.702355+00:00
+@@ -41,7 +41,7 @@
+ version = "0.2"
  
- [features]
- default = ["std"]
--nightly = ["crossbeam-utils/nightly", "arrayvec/use_union"]
- sanitize = []
- std = ["crossbeam-utils/std", "lazy_static"]
+ [dependencies.scopeguard]
+-version = "0.3"
++version = "1"
+ default-features = false
+ [dev-dependencies.rand]
+ version = "0.6"
diff --git a/rust-crossbeam-epoch.spec b/rust-crossbeam-epoch.spec
index 8299fe6..d7d52df 100644
--- a/rust-crossbeam-epoch.spec
+++ b/rust-crossbeam-epoch.spec
@@ -1,5 +1,4 @@
-# Generated by rust2rpm
-# * Tests are run in infrastructure
+# Generated by rust2rpm-9-1.fc31
 %bcond_with check
 %global debug_package %{nil}
 
@@ -7,7 +6,7 @@
 
 Name:           rust-%{crate}
 Version:        0.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Epoch-based garbage collection
 
 # Upstream license specification: MIT/Apache-2.0
@@ -15,7 +14,7 @@ License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/crossbeam-epoch
 Source:         %{crates_source}
 # Initial patched metadata
-# * no nightly features
+# * Update scopeguard to 1, https://github.com/crossbeam-rs/crossbeam/pull/370
 Patch0:         crossbeam-epoch-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
@@ -27,7 +26,7 @@ BuildRequires:  (crate(crossbeam-utils) >= 0.6.0 with crate(crossbeam-utils) < 0
 BuildRequires:  (crate(crossbeam-utils/std) >= 0.6.0 with crate(crossbeam-utils/std) < 0.7.0)
 BuildRequires:  (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0)
 BuildRequires:  (crate(memoffset/default) >= 0.2.0 with crate(memoffset/default) < 0.3.0)
-BuildRequires:  (crate(scopeguard) >= 0.3.0 with crate(scopeguard) < 0.4.0)
+BuildRequires:  (crate(scopeguard) >= 1.0.0 with crate(scopeguard) < 2.0.0)
 %if %{with check}
 BuildRequires:  (crate(rand/default) >= 0.6.0 with crate(rand/default) < 0.7.0)
 %endif
@@ -75,6 +74,18 @@ which use "lazy_static" feature of "%{crate}" crate.
 %files       -n %{name}+lazy_static-devel
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
+%package     -n %{name}+nightly-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+nightly-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "nightly" feature of "%{crate}" crate.
+
+%files       -n %{name}+nightly-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
 %package     -n %{name}+sanitize-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -115,6 +126,9 @@ which use "std" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Tue May 07 07:29:43 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.7.1-3
+- Update scopeguard to 1
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild