From ce3c673bc45eec98d2635fd06070a21cd200e8c0 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m@gmail.com>
Date: Nov 09 2018 20:35:34 +0000
Subject: Adapt to new packaging


Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>

---

diff --git a/itertools-0.7.7-fix-metadata.diff b/itertools-0.7.7-fix-metadata.diff
deleted file mode 100644
index 39eb117..0000000
--- a/itertools-0.7.7-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- itertools-0.7.7/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ itertools-0.7.7/Cargo.toml	2018-03-05T08:19:00.117644+01:00
-@@ -35,7 +35,7 @@
- version = "0.2"
- 
- [dev-dependencies.quickcheck]
--version = "0.5"
-+version = "0.6"
- default-features = false
- 
- [features]
diff --git a/itertools-fix-metadata.diff b/itertools-fix-metadata.diff
new file mode 100644
index 0000000..ae46c5f
--- /dev/null
+++ b/itertools-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- itertools-0.7.8/Cargo.toml  1970-01-01T01:00:00+01:00
++++ itertools-0.7.8/Cargo.toml  2018-11-09T21:26:51.049046+01:00
+@@ -35,7 +35,7 @@
+ version = "0.2"
+ 
+ [dev-dependencies.quickcheck]
+-version = "0.5"
++version = "0.7"
+ default-features = false
+ 
+ [features]
diff --git a/rust-itertools.spec b/rust-itertools.spec
index 779a624..11283c0 100644
--- a/rust-itertools.spec
+++ b/rust-itertools.spec
@@ -7,39 +7,68 @@
 
 Name:           rust-%{crate}
 Version:        0.7.8
-Release:        4%{?dist}
-Summary:        Extra iterator adaptors, iterator methods, free functions, and macros
+Release:        5%{?dist}
+Summary:        Extra iterator adaptors, iterator methods, free functions, and macros.
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/itertools
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
-# * Bump quickcheck to 0.6, https://github.com/bluss/rust-itertools/pull/253
-Patch0:         itertools-0.7.7-fix-metadata.diff
+# * Bump quickcheck to 0.7, https://github.com/bluss/rust-itertools/pull/253
+Patch0:         itertools-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
 BuildRequires:  (crate(either) >= 1.0.0 with crate(either) < 2.0.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(permutohedron) >= 0.2.0 with crate(permutohedron) < 0.3.0)
-BuildRequires:  (crate(quickcheck) >= 0.6.0 with crate(quickcheck) < 0.7.0)
+BuildRequires:  (crate(permutohedron/default) >= 0.2.0 with crate(permutohedron/default) < 0.3.0)
+BuildRequires:  (crate(quickcheck) >= 0.7.0 with crate(quickcheck) < 0.8.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Extra iterator adaptors, iterator methods, free functions, and macros.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Extra iterator adaptors, iterator methods, free functions, and macros.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%{cargo_registry}/%{crate}-%{version}/
+%exclude %{cargo_registry}/%{crate}-%{version}/{Makefile,custom.css}
+
+%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
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -56,13 +85,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.rst
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/{Makefile,custom.css}
-
 %changelog
+* Fri Nov 09 2018 Robert-André Mauchin <zebob.m@gmail.com> - 0.7.8-5
+- Adapt to new packaging
+
 * Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.7.8-4
 - Rebuild to trigger tests