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

---
 rust-jobserver.spec | 55 ++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/rust-jobserver.spec b/rust-jobserver.spec
index 6a3c5c1..2a8df78 100644
--- a/rust-jobserver.spec
+++ b/rust-jobserver.spec
@@ -7,9 +7,10 @@
 
 Name:           rust-%{crate}
 Version:        0.1.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Implementation of the GNU make jobserver for Rust
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/jobserver
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
@@ -23,30 +24,46 @@ Patch1:         0001-bump-tokio-process-to-0.2.patch
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0)
-BuildRequires:  (crate(log) >= 0.4.0 with crate(log) < 0.5.0)
+BuildRequires:  (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0)
+BuildRequires:  (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(futures) >= 0.1.0 with crate(futures) < 0.2.0)
-BuildRequires:  (crate(num_cpus) >= 1.0.0 with crate(num_cpus) < 2.0.0)
-BuildRequires:  (crate(tempdir) >= 0.3.0 with crate(tempdir) < 0.4.0)
-BuildRequires:  (crate(tokio-core) >= 0.1.0 with crate(tokio-core) < 0.2.0)
-BuildRequires:  (crate(tokio-process) >= 0.2.0 with crate(tokio-process) < 0.3.0)
+BuildRequires:  (crate(futures/default) >= 0.1.0 with crate(futures/default) < 0.2.0)
+BuildRequires:  (crate(num_cpus/default) >= 1.0.0 with crate(num_cpus/default) < 2.0.0)
+BuildRequires:  (crate(tempdir/default) >= 0.3.0 with crate(tempdir/default) < 0.4.0)
+BuildRequires:  (crate(tokio-core/default) >= 0.1.0 with crate(tokio-core/default) < 0.2.0)
+BuildRequires:  (crate(tokio-process/default) >= 0.2.0 with crate(tokio-process/default) < 0.3.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+An implementation of the GNU make jobserver for Rust.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-An implementation of the GNU make jobserver for Rust.
+%description    devel %{_description}
 
 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md
+%{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 "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -63,12 +80,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Tue Nov 13 2018 Josh Stone <jistone@redhat.com> - 0.1.11-6
+- Adapt to new packaging
+
 * Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.11-5
 - Rebuild to trigger tests