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

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rust-grep-regex.spec | 51 ++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/rust-grep-regex.spec b/rust-grep-regex.spec
index 0111e74..4e6ed38 100644
--- a/rust-grep-regex.spec
+++ b/rust-grep-regex.spec
@@ -7,7 +7,7 @@
 
 Name:           rust-%{crate}
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Use Rust's regex library with the 'grep' crate
 
 # Upstream license specification: Unlicense/MIT
@@ -18,26 +18,43 @@ Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(grep-matcher) >= 0.1.1 with crate(grep-matcher) < 0.2.0)
-BuildRequires:  (crate(log) >= 0.4.5 with crate(log) < 0.5.0)
-BuildRequires:  (crate(regex) >= 1.0.5 with crate(regex) < 2.0.0)
-BuildRequires:  (crate(regex-syntax) >= 0.6.2 with crate(regex-syntax) < 0.7.0)
-BuildRequires:  (crate(thread_local) >= 0.3.6 with crate(thread_local) < 0.4.0)
-BuildRequires:  (crate(utf8-ranges) >= 1.0.1 with crate(utf8-ranges) < 2.0.0)
+BuildRequires:  (crate(grep-matcher/default) >= 0.1.1 with crate(grep-matcher/default) < 0.2.0)
+BuildRequires:  (crate(log/default) >= 0.4.5 with crate(log/default) < 0.5.0)
+BuildRequires:  (crate(regex-syntax/default) >= 0.6.2 with crate(regex-syntax/default) < 0.7.0)
+BuildRequires:  (crate(regex/default) >= 1.0.5 with crate(regex/default) < 2.0.0)
+BuildRequires:  (crate(thread_local/default) >= 0.3.6 with crate(thread_local/default) < 0.4.0)
+BuildRequires:  (crate(utf8-ranges/default) >= 1.0.1 with crate(utf8-ranges/default) < 2.0.0)
+
+%global _description \
+Use Rust's regex library with the 'grep' crate.
 
-%description
-%{summary}.
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Use Rust's regex library with the 'grep' crate.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license UNLICENSE LICENSE-MIT
+%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 %{crate} from crates.io.
+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
@@ -54,12 +71,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license UNLICENSE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Sun Oct 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.1-3
+- Adapt to new packaging
+
 * Sun Oct 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.1-2
 - Run tests in infrastructure