From 6e1795ea8ad6fbe0c84bd9d0d7ccea0524df5e64 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 8 Nov 2018 16:24:36 -0800
Subject: [PATCH] Adapt to new packaging

---
 rust-scoped-tls.spec | 57 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/rust-scoped-tls.spec b/rust-scoped-tls.spec
index 8ea90dc..b1372c1 100644
--- a/rust-scoped-tls.spec
+++ b/rust-scoped-tls.spec
@@ -6,9 +6,10 @@
 
 Name:           rust-%{crate}
 Version:        0.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Implementation of the standard library's old `scoped_thread_local!` macro
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/scoped-tls
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
@@ -17,20 +18,51 @@ ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 
-%description
-%{summary}.
+%global _description \
+Library implementation of the standard library's old `scoped_thread_local!`\
+macro for providing scoped access to thread local storage (TLS) so any type can\
+be stored into TLS.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Library implementation of the standard library's old `scoped_thread_local!`
-macro for providing scoped access to thread local storage (TLS) so any type can
-be stored into TLS.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
+
+%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}+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
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -47,13 +79,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
-
 %changelog
+* Fri Nov 09 2018 Josh Stone <jistone@redhat.com> - 0.1.2-3
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild