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

---
 rust-bencher.spec | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/rust-bencher.spec b/rust-bencher.spec
index 4a8942f..c1f3f7e 100644
--- a/rust-bencher.spec
+++ b/rust-bencher.spec
@@ -6,9 +6,10 @@
 
 Name:           rust-%{crate}
 Version:        0.1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Port of the libtest (unstable Rust) benchmark runner to Rust stable releases
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/bencher
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
@@ -17,21 +18,39 @@ ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 
-%description
-%{summary}.
+%global _description \
+A port of the libtest (unstable Rust) benchmark runner to Rust stable releases.\
+Supports running benchmarks and filtering based on the name. Benchmark\
+execution works exactly the same way and no more (caveat: black_box is still\
+missing!).
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A port of the libtest (unstable Rust) benchmark runner to Rust stable releases.
-Supports running benchmarks and filtering based on the name. Benchmark
-execution works exactly the same way and no more (caveat: black_box is still
-missing!).
+%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.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 "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -48,12 +67,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
+* Tue Oct 30 2018 Josh Stone <jistone@redhat.com> - 0.1.5-5
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild