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

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 grep-cli-fix-metadata.diff |  2 +-
 rust-grep-cli.spec         | 55 ++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/grep-cli-fix-metadata.diff b/grep-cli-fix-metadata.diff
index 9695751..f98c088 100644
--- a/grep-cli-fix-metadata.diff
+++ b/grep-cli-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- grep-cli-0.1.1/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ grep-cli-0.1.1/Cargo.toml	2018-09-08T14:18:08.427586+02:00
++++ grep-cli-0.1.1/Cargo.toml	2018-10-28T02:54:00.778015+02:00
 @@ -41,5 +41,3 @@
  
  [dependencies.termcolor]
diff --git a/rust-grep-cli.spec b/rust-grep-cli.spec
index f4a18b8..bcd1766 100644
--- a/rust-grep-cli.spec
+++ b/rust-grep-cli.spec
@@ -7,7 +7,7 @@
 
 Name:           rust-%{crate}
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities for search oriented command line applications
 
 # Upstream license specification: Unlicense/MIT
@@ -21,27 +21,44 @@ Patch0:         grep-cli-fix-metadata.diff
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(atty) >= 0.2.11 with crate(atty) < 0.3.0)
-BuildRequires:  (crate(globset) >= 0.4.2 with crate(globset) < 0.5.0)
-BuildRequires:  (crate(lazy_static) >= 1.1.0 with crate(lazy_static) < 2.0.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(same-file) >= 1.0.3 with crate(same-file) < 2.0.0)
-BuildRequires:  (crate(termcolor) >= 1.0.3 with crate(termcolor) < 2.0.0)
-
-%description
-%{summary}.
+BuildRequires:  (crate(atty/default) >= 0.2.11 with crate(atty/default) < 0.3.0)
+BuildRequires:  (crate(globset/default) >= 0.4.2 with crate(globset/default) < 0.5.0)
+BuildRequires:  (crate(lazy_static/default) >= 1.1.0 with crate(lazy_static/default) < 2.0.0)
+BuildRequires:  (crate(log/default) >= 0.4.5 with crate(log/default) < 0.5.0)
+BuildRequires:  (crate(regex/default) >= 1.0.5 with crate(regex/default) < 2.0.0)
+BuildRequires:  (crate(same-file/default) >= 1.0.3 with crate(same-file/default) < 2.0.0)
+BuildRequires:  (crate(termcolor/default) >= 1.0.3 with crate(termcolor/default) < 2.0.0)
+
+%global _description \
+Utilities for search oriented command line applications.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Utilities for search oriented command line applications.
+%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 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 "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -58,12 +75,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