From 69557a9c7a63f3ec4c49229e33ae7583f686380f Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 7 Jan 2019 23:15:28 -0800
Subject: [PATCH] Update to 0.7.5 Adapt to new packaging

---
 .gitignore      |  1 +
 rust-utf-8.spec | 38 ++++++++++++++++++++++++++++----------
 sources         |  2 +-
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 963b739..dcbdd8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /utf-8-0.7.4.crate
+/utf-8-0.7.5.crate
diff --git a/rust-utf-8.spec b/rust-utf-8.spec
index 4c65884..f9c6f78 100644
--- a/rust-utf-8.spec
+++ b/rust-utf-8.spec
@@ -5,10 +5,11 @@
 %global crate utf-8
 
 Name:           rust-%{crate}
-Version:        0.7.4
+Version:        0.7.5
 Release:        1%{?dist}
 Summary:        Incremental, zero-copy UTF-8 decoding with error handling
 
+# Upstream license specification: MIT OR Apache-2.0
 # https://github.com/SimonSapin/rust-utf8/issues/3
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/utf-8
@@ -18,18 +19,35 @@ ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 
-%description
-%{summary}.
+%global _description \
+Incremental, zero-copy UTF-8 decoding with error handling.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Incremental, zero-copy UTF-8 decoding with error handling.
+%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
+%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
@@ -46,10 +64,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Tue Jan 08 2019 Josh Stone <jistone@redhat.com> - 0.7.5-1
+- Update to 0.7.5
+- Adapt to new packaging
+
 * Sun Aug 12 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.7.4-1
 - Initial package
diff --git a/sources b/sources
index d55b454..53028bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (utf-8-0.7.4.crate) = 4e958ca8c625378da4182767ef5aa2f0fe27e90d2def76449717dce37435b75aba97c451acdd6988cb107c6facfcf3d517391a183758e289327d078ce225c798
+SHA512 (utf-8-0.7.5.crate) = 610dba6991597b117f3ec602c2c1df42da3a554bd452283f56867d53f1bdc7c0bac6e593b63ec3186016d886951397314ff7e0cf0bfae8015281a6afe77f19ec