From 6310fee8639dd342e255e27749bb5bcb516c6180 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 27 Oct 2018 02:17:52 +0200
Subject: [PATCH] Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 ...a.diff => remove_dir_all-fix-metadata.diff |  2 +-
 rust-remove_dir_all.spec                      | 39 +++++++++++++------
 2 files changed, 29 insertions(+), 12 deletions(-)
 rename remove_dir_all-0.5.1-fix-metadata.diff => remove_dir_all-fix-metadata.diff (84%)

diff --git a/remove_dir_all-0.5.1-fix-metadata.diff b/remove_dir_all-fix-metadata.diff
similarity index 84%
rename from remove_dir_all-0.5.1-fix-metadata.diff
rename to remove_dir_all-fix-metadata.diff
index 5b2f7fc..ea41b4c 100644
--- a/remove_dir_all-0.5.1-fix-metadata.diff
+++ b/remove_dir_all-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- remove_dir_all-0.5.1/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ remove_dir_all-0.5.1/Cargo.toml	2018-04-20T09:13:44.138170+02:00
++++ remove_dir_all-0.5.1/Cargo.toml	2018-10-27T02:17:20.081383+02:00
 @@ -21,6 +21,3 @@
  categories = ["filesystem"]
  license = "MIT/Apache-2.0"
diff --git a/rust-remove_dir_all.spec b/rust-remove_dir_all.spec
index c33e988..2ad1301 100644
--- a/rust-remove_dir_all.spec
+++ b/rust-remove_dir_all.spec
@@ -6,32 +6,50 @@
 
 Name:           rust-%{crate}
 Version:        0.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Safe, reliable implementation of remove_dir_all
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/remove_dir_all
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * No windows
-Patch0:         remove_dir_all-0.5.1-fix-metadata.diff
+Patch0:         remove_dir_all-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 
-%description
-%{summary}.
+%global _description \
+A safe, reliable implementation of remove_dir_all.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A safe, reliable implementation of remove_dir_all for Windows.
+%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
+%{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,11 +66,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENCE-MIT LICENCE-APACHE
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Sat Oct 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.5.1-3
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild