From b9b6a9aa8f91f45e8eb624abac6c08385993f890 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 31 Oct 2018 11:57:07 +0100
Subject: [PATCH] Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rust-rustc-serialize.spec                | 50 ++++++++++++++++--------
 rustc-serialize-0.3.24-fix-metadata.diff |  8 ----
 rustc-serialize-fix-metadata.diff        | 11 ++++++
 3 files changed, 44 insertions(+), 25 deletions(-)
 delete mode 100644 rustc-serialize-0.3.24-fix-metadata.diff
 create mode 100644 rustc-serialize-fix-metadata.diff

diff --git a/rust-rustc-serialize.spec b/rust-rustc-serialize.spec
index 952202e..167bbb8 100644
--- a/rust-rustc-serialize.spec
+++ b/rust-rustc-serialize.spec
@@ -6,38 +6,57 @@
 
 Name:           rust-%{crate}
 Version:        0.3.24
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Generic serialization/deserialization support
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/rustc-serialize
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * Bump rand to 0.4
-Patch0:         rustc-serialize-0.3.24-fix-metadata.diff
+# * Exclude CI files
+Patch0:         rustc-serialize-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(rand) >= 0.4.0 with crate(rand) < 0.5.0)
+BuildRequires:  (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Generic serialization/deserialization support corresponding to the\
+`derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes\
+support for hex, base64, and json encoding and decoding.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Generic serialization/deserialization support corresponding to the
-`derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes
-support for hex, base64, and json encoding and decoding.
+%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
+%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 "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -54,13 +73,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
-
 %changelog
+* Wed Oct 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.3.24-7
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.24-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/rustc-serialize-0.3.24-fix-metadata.diff b/rustc-serialize-0.3.24-fix-metadata.diff
deleted file mode 100644
index 28a86df..0000000
--- a/rustc-serialize-0.3.24-fix-metadata.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- rustc-serialize-0.3.24/Cargo.toml	2017-04-21T16:10:04+02:00
-+++ rustc-serialize-0.3.24/Cargo.toml	2018-01-01T12:18:33.356847+01:00
-@@ -15,4 +15,4 @@
- """
- 
- [dev-dependencies]
--rand = "0.3"
-+rand = "0.4"
diff --git a/rustc-serialize-fix-metadata.diff b/rustc-serialize-fix-metadata.diff
new file mode 100644
index 0000000..3b4b954
--- /dev/null
+++ b/rustc-serialize-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- rustc-serialize-0.3.24/Cargo.toml	2017-04-21T16:10:04+02:00
++++ rustc-serialize-0.3.24/Cargo.toml	2018-10-31T11:56:20.133187+01:00
+@@ -13,6 +13,7 @@
+ `derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes
+ support for hex, base64, and json encoding and decoding.
+ """
++exclude = ["/.travis.yml", "/appveyor.yml"]
+ 
+ [dev-dependencies]
+-rand = "0.3"
++rand = "0.4"