From 0ece0cf2f50d153fe44202efe517e604ef2ca8a2 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 12 Nov 2018 16:23:35 -0800
Subject: [PATCH] Adapt to new packaging

---
 rust-crossbeam.spec | 70 +++++++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/rust-crossbeam.spec b/rust-crossbeam.spec
index 7e92578..3d8a585 100644
--- a/rust-crossbeam.spec
+++ b/rust-crossbeam.spec
@@ -6,7 +6,7 @@
 
 Name:           rust-%{crate}
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Support for concurrent programming
 
 # Upstream license specification: MIT/Apache-2.0
@@ -20,29 +20,61 @@ Patch0:         crossbeam-fix-metadata.diff
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(crossbeam-channel) >= 0.2.0 with crate(crossbeam-channel) < 0.3.0)
-BuildRequires:  (crate(crossbeam-deque) >= 0.5.0 with crate(crossbeam-deque) < 0.6.0)
-BuildRequires:  (crate(crossbeam-epoch) >= 0.5.0 with crate(crossbeam-epoch) < 0.6.0)
-BuildRequires:  (crate(crossbeam-utils) >= 0.5.0 with crate(crossbeam-utils) < 0.6.0)
+BuildRequires:  (crate(crossbeam-channel/default) >= 0.2.0 with crate(crossbeam-channel/default) < 0.3.0)
+BuildRequires:  (crate(crossbeam-deque/default) >= 0.5.0 with crate(crossbeam-deque/default) < 0.6.0)
+BuildRequires:  (crate(crossbeam-epoch/default) >= 0.5.0 with crate(crossbeam-epoch/default) < 0.6.0)
+BuildRequires:  (crate(crossbeam-epoch/use_std) >= 0.5.0 with crate(crossbeam-epoch/use_std) < 0.6.0)
+BuildRequires:  (crate(crossbeam-utils/default) >= 0.5.0 with crate(crossbeam-utils/default) < 0.6.0)
+BuildRequires:  (crate(crossbeam-utils/use_std) >= 0.5.0 with crate(crossbeam-utils/use_std) < 0.6.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(rand) >= 0.5.0 with crate(rand) < 0.6.0)
+BuildRequires:  (crate(rand/default) >= 0.5.0 with crate(rand/default) < 0.6.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Support for concurrent programming: memory management, utilities, non-blocking\
+data structures.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Support for concurrent programming: memory management, utilities, non-blocking
-data structures.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-APACHE LICENSE-MIT
+%doc README.md CHANGELOG.md
+%{cargo_registry}/%{crate}-%{version}/
+# https://github.com/aturon/crossbeam/issues/111
+%exclude %{_bindir}/{stress-msq,bench}
+
+%package     -n %{name}+default-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-devel %{_description}
 
 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+use_std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+use_std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "use_std" feature of "%{crate}" crate.
+
+%files       -n %{name}+use_std-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -59,14 +91,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version}/
-# https://github.com/aturon/crossbeam/issues/111
-%exclude %{_bindir}/{stress-msq,bench}
-
 %changelog
+* Tue Nov 13 2018 Josh Stone <jistone@redhat.com> - 0.4.1-2
+- Adapt to new packaging
+
 * Sat Sep 08 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.1-1
 - Update to 0.4.1