From a3c50e08fa5979d9ea54298099793e235a3e4e22 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 9 Mar 2019 15:42:48 +0100
Subject: [PATCH] Bring spin back

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 lazy_static-fix-metadata.diff | 15 ---------------
 rust-lazy_static.spec         | 33 +++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 19 deletions(-)
 delete mode 100644 lazy_static-fix-metadata.diff

diff --git a/lazy_static-fix-metadata.diff b/lazy_static-fix-metadata.diff
deleted file mode 100644
index 8bbdaea..0000000
--- a/lazy_static-fix-metadata.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- lazy_static-1.3.0/Cargo.toml	1969-12-31T16:00:00-08:00
-+++ lazy_static-1.3.0/Cargo.toml	2019-02-28T09:25:59.738921-08:00
-@@ -22,12 +22,7 @@
- categories = ["no-std", "rust-patterns", "memory-management"]
- license = "MIT/Apache-2.0"
- repository = "https://github.com/rust-lang-nursery/lazy-static.rs"
--[dependencies.spin]
--version = "0.5.0"
--optional = true
- 
--[features]
--spin_no_std = ["spin"]
- [badges.appveyor]
- repository = "rust-lang-nursery/lazy-static.rs"
- 
diff --git a/rust-lazy_static.spec b/rust-lazy_static.spec
index 3eeb6d2..0b57e23 100644
--- a/rust-lazy_static.spec
+++ b/rust-lazy_static.spec
@@ -7,20 +7,18 @@
 
 Name:           rust-%{crate}
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Macro for declaring lazily evaluated statics in Rust
 
 # Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/lazy_static
 Source:         %{crates_source}
-# Initial patched metadata
-# * Remove spin, it is not usable on stable (FIXME: still true?)
-Patch0:         lazy_static-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
+BuildRequires:  (crate(spin/default) >= 0.5.0 with crate(spin/default) < 0.6.0)
 
 %global _description \
 A macro for declaring lazily evaluated statics in Rust.
@@ -53,6 +51,30 @@ which use "default" feature of "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
+%package     -n %{name}+spin-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+spin-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "spin" feature of "%{crate}" crate.
+
+%files       -n %{name}+spin-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+spin_no_std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+spin_no_std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "spin_no_std" feature of "%{crate}" crate.
+
+%files       -n %{name}+spin_no_std-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
@@ -69,6 +91,9 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Sat Mar 09 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.0-2
+- Bring spin back
+
 * Thu Feb 28 2019 Josh Stone <jistone@redhat.com> - 1.3.0-1
 - Update to 1.3.0