From 933a8bfdcc9e14d04a1336b2d49538c6df3dbacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Fri, 9 Nov 2018 23:10:52 +0100
Subject: [PATCH] Adapt to new packaging
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
 ...etadata.diff => csv-core-fix-metadata.diff |  4 +-
 rust-csv-core.spec                            | 58 ++++++++++++++-----
 2 files changed, 45 insertions(+), 17 deletions(-)
 rename csv-core-0.1.4-fix-metadata.diff => csv-core-fix-metadata.diff (56%)

diff --git a/csv-core-0.1.4-fix-metadata.diff b/csv-core-fix-metadata.diff
similarity index 56%
rename from csv-core-0.1.4-fix-metadata.diff
rename to csv-core-fix-metadata.diff
index 3faf7a4..dab9c9f 100644
--- a/csv-core-0.1.4-fix-metadata.diff
+++ b/csv-core-fix-metadata.diff
@@ -1,5 +1,5 @@
---- csv-core-0.1.4/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ csv-core-0.1.4/Cargo.toml	2018-06-14T08:44:14.607427+02:00
+--- csv-core-0.1.4/Cargo.toml   1970-01-01T01:00:00+01:00
++++ csv-core-0.1.4/Cargo.toml   2018-11-09T23:02:05.066730+01:00
 @@ -34,7 +34,7 @@
  version = "2"
  default-features = false
diff --git a/rust-csv-core.spec b/rust-csv-core.spec
index 5e6ea05..a2cd362 100644
--- a/rust-csv-core.spec
+++ b/rust-csv-core.spec
@@ -6,38 +6,68 @@
 
 Name:           rust-%{crate}
 Version:        0.1.4
-Release:        2%{?dist}
-Summary:        Bare bones CSV parsing with no_std support
+Release:        3%{?dist}
+Summary:        Bare bones CSV parsing with no_std support.
 
+# Upstream license specification: Unlicense/MIT
 License:        Unlicense or MIT
 URL:            https://crates.io/crates/csv-core
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * Bump arrayvec to 0.4, https://github.com/BurntSushi/rust-csv/commit/9030a4a5f3c04cfecea69cca5b934c589f81427e
-Patch0:         csv-core-0.1.4-fix-metadata.diff
+Patch0:         csv-core-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
 BuildRequires:  (crate(memchr) >= 2.0.0 with crate(memchr) < 3.0.0)
+BuildRequires:  (crate(memchr/libc) >= 2.0.0 with crate(memchr/libc) < 3.0.0)
 %if %{with check}
-# [dev-dependencies]
 BuildRequires:  (crate(arrayvec) >= 0.4.0 with crate(arrayvec) < 0.5.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Bare bones CSV parsing with no_std support.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Bare bones CSV parsing with no_std support.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license COPYING LICENSE-MIT UNLICENSE
+%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 %{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}+libc-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+libc-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libc" feature of "%{crate}" crate.
+
+%files       -n %{name}+libc-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -54,12 +84,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license COPYING LICENSE-MIT UNLICENSE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Fri Nov 09 2018 Robert-André Mauchin <zebob.m@gmail.com> - 0.1.4-3
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild