From 53c1fd50c528fa9ddf49d8c4b996e7acde05bc05 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 28 Oct 2018 01:00:49 +0200
Subject: [PATCH] Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rust-scopeguard.spec | 57 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/rust-scopeguard.spec b/rust-scopeguard.spec
index 7a63957..77bea38 100644
--- a/rust-scopeguard.spec
+++ b/rust-scopeguard.spec
@@ -7,9 +7,10 @@
 
 Name:           rust-%{crate}
 Version:        0.3.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        RAII scope guard that will run a given closure when it goes out of scope
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/scopeguard
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
@@ -18,22 +19,52 @@ ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 
-%description
-%{summary}.
+%global _description \
+A RAII scope guard that will run a given closure when it goes out of scope,\
+even if the code between panics (assuming unwinding panic).\
+\
+Defines the macros `defer!` and `defer_on_unwind!`;\
+the latter only runs if the scope is extited through unwinding on panic.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A RAII scope guard that will run a given closure when it goes out of scope,
-even if the code between panics (assuming unwinding panic).
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
 
-Defines the macros `defer!` and `defer_on_unwind!`; the latter only runs
-if the scope is extited through unwinding on panic.
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.rst
+%{cargo_registry}/%{crate}-%{version}/
+
+%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
@@ -50,12 +81,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.rst
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Sat Oct 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.3-6
+- Adapt to new packaging
+
 * Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.3-5
 - Run tests in infrastructure