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

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 arrayvec-0.4.7-fix-metadata.diff |  7 ---
 rust-arrayvec.spec               | 91 ++++++++++++++++++++++++--------
 2 files changed, 69 insertions(+), 29 deletions(-)
 delete mode 100644 arrayvec-0.4.7-fix-metadata.diff

diff --git a/arrayvec-0.4.7-fix-metadata.diff b/arrayvec-0.4.7-fix-metadata.diff
deleted file mode 100644
index 3ce394e..0000000
--- a/arrayvec-0.4.7-fix-metadata.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- arrayvec-0.4.7/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ arrayvec-0.4.7/Cargo.toml	2018-01-18T08:58:23.738667+01:00
-@@ -54,4 +54,3 @@
- default = ["std"]
- serde-1 = ["serde"]
- std = []
--use_union = []
diff --git a/rust-arrayvec.spec b/rust-arrayvec.spec
index e4bd712..d997cc3 100644
--- a/rust-arrayvec.spec
+++ b/rust-arrayvec.spec
@@ -1,5 +1,5 @@
 # Generated by rust2rpm
-# Tests are run in infrastructure
+# * Tests are run in infrastructure
 %bcond_with check
 %global debug_package %{nil}
 
@@ -7,42 +7,92 @@
 
 Name:           rust-%{crate}
 Version:        0.4.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Vector with fixed capacity, backed by an array
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/arrayvec
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
-# Initial patched metadata
-# * nodrop-union is nightly
-Patch0:         arrayvec-0.4.7-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
 BuildRequires:  (crate(nodrop) >= 0.1.12 with crate(nodrop) < 0.2.0)
 BuildRequires:  (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(bencher) >= 0.1.4 with crate(bencher) < 0.2.0)
-BuildRequires:  (crate(matches) >= 0.1.0 with crate(matches) < 0.2.0)
-BuildRequires:  (crate(serde_test) >= 1.0.0 with crate(serde_test) < 2.0.0)
+BuildRequires:  (crate(bencher/default) >= 0.1.4 with crate(bencher/default) < 0.2.0)
+BuildRequires:  (crate(matches/default) >= 0.1.0 with crate(matches/default) < 0.2.0)
+BuildRequires:  (crate(serde_test/default) >= 1.0.0 with crate(serde_test/default) < 2.0.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+A vector with fixed capacity, backed by an array (it can be stored on the stack\
+too). Implements fixed capacity ArrayVec and ArrayString.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A vector with fixed capacity, backed by an array (it can be stored on the stack
-too). Implements fixed capacity ArrayVec and ArrayString.
+%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.rst
+%{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
+
+%package     -n %{name}+serde-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serde-devel %{_description}
 
 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "serde" feature of "%{crate}" crate.
+
+%files       -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+serde-1-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serde-1-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde-1" feature of "%{crate}" crate.
+
+%files       -n %{name}+serde-1-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files       -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -59,13 +109,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}/custom.css
-
 %changelog
+* Sat Oct 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.7-5
+- Adapt to new packaging
+
 * Sat Jul 28 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.7-4
 - Rebuild to trigger tests