From 97ba14a2f0206adf8cad42bfb0d1e92c4e8a4c4c Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 4 Nov 2018 16:48:10 +0100
Subject: [PATCH] Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 futures-fix-metadata.diff | 10 ------
 rust-futures0.1.spec      | 68 ++++++++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 26 deletions(-)
 delete mode 100644 futures-fix-metadata.diff

diff --git a/futures-fix-metadata.diff b/futures-fix-metadata.diff
deleted file mode 100644
index 6e4350e..0000000
--- a/futures-fix-metadata.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- futures-0.1.24/Cargo.toml	1969-12-31T16:00:00-08:00
-+++ futures-0.1.24/Cargo.toml	2018-09-07T16:14:02.543757-07:00
-@@ -27,7 +27,6 @@
- 
- [features]
- default = ["use_std", "with-deprecated"]
--nightly = []
- use_std = []
- with-deprecated = []
- [badges.appveyor]
diff --git a/rust-futures0.1.spec b/rust-futures0.1.spec
index d49db92..df2f6ab 100644
--- a/rust-futures0.1.spec
+++ b/rust-futures0.1.spec
@@ -6,34 +6,73 @@
 
 Name:           rust-%{crate}0.1
 Version:        0.1.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Implementation of futures and streams featuring zero allocations
 
 # Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/futures
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
-# Initial patched metadata
-# * no nightly features
-Patch0:         futures-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 
-%description
-%{summary}.
+%global _description \
+An implementation of futures and streams featuring zero allocations,\
+composability, and iterator-like interfaces.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-An implementation of futures and streams featuring zero allocations,
-composability, and iterator-like interfaces.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md CHANGELOG.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
+
+%package     -n %{name}+use_std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+use_std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "use_std" feature of "%{crate}" crate.
+
+%files       -n %{name}+use_std-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+with-deprecated-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+with-deprecated-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "with-deprecated" feature of "%{crate}" crate.
+
+%files       -n %{name}+with-deprecated-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -50,13 +89,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
-
 %changelog
+* Sun Nov 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.25-2
+- Adapt to new packaging
+
 * Mon Oct 08 2018 Josh Stone <jistone@redhat.com> - 0.1.25-1
 - Update to 0.1.25