From b838c59599464c65dc18c894613772250a1d1cde Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 29 Oct 2018 16:52:31 -0700
Subject: [PATCH] Adapt to new packaging

---
 rust-ctrlc.spec | 56 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/rust-ctrlc.spec b/rust-ctrlc.spec
index a482cb6..168f4ac 100644
--- a/rust-ctrlc.spec
+++ b/rust-ctrlc.spec
@@ -6,9 +6,10 @@
 
 Name:           rust-%{crate}
 Version:        3.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easy Ctrl-C handler for Rust projects
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/ctrlc
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
@@ -19,21 +20,51 @@ Patch0:         ctrlc-3.1.1-fix-metadata.diff
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(nix) >= 0.11.0 with crate(nix) < 0.12.0)
+BuildRequires:  (crate(nix/default) >= 0.11.0 with crate(nix/default) < 0.12.0)
 
-%description
-%{summary}.
+%global _description \
+Easy Ctrl-C handler for Rust projects.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Easy Ctrl-C handler for Rust projects.
+%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}+termination-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+termination-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "termination" feature of "%{crate}" crate.
+
+%files       -n %{name}+termination-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -50,13 +81,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
+* Mon Oct 29 2018 Josh Stone <jistone@redhat.com> - 3.1.1-2
+- Adapt to new packaging
+
 * Tue Jul 17 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.1.1-1
 - Update to 3.1.1