From 8878d7f110b67ddc3e1e1e28f2efd25a392a40a7 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 27 Oct 2018 23:58:45 +0200
Subject: [PATCH] Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rust-thread-id.spec                           | 44 +++++++++++++------
 ...tadata.diff => thread-id-fix-metadata.diff |  4 +-
 2 files changed, 32 insertions(+), 16 deletions(-)
 rename thread-id-3.3.0-fix-metadata.diff => thread-id-fix-metadata.diff (67%)

diff --git a/rust-thread-id.spec b/rust-thread-id.spec
index 468b8be..94d4ec6 100644
--- a/rust-thread-id.spec
+++ b/rust-thread-id.spec
@@ -6,35 +6,53 @@
 
 Name:           rust-%{crate}
 Version:        3.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Get a unique thread ID
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/thread-id
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * No windows
 # * No redox
-Patch0:         thread-id-3.3.0-fix-metadata.diff
+Patch0:         thread-id-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(libc) >= 0.2.6 with crate(libc) < 0.3.0)
+BuildRequires:  (crate(libc/default) >= 0.2.6 with crate(libc/default) < 0.3.0)
 
-%description
-%{summary}.
+%global _description \
+Get a unique thread ID.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Get a unique thread ID.
+%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
@@ -51,12 +69,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license license-mit license-apache
-%doc readme.md
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Sat Oct 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.3.0-3
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/thread-id-3.3.0-fix-metadata.diff b/thread-id-fix-metadata.diff
similarity index 67%
rename from thread-id-3.3.0-fix-metadata.diff
rename to thread-id-fix-metadata.diff
index 19d3c67..39c3b3c 100644
--- a/thread-id-3.3.0-fix-metadata.diff
+++ b/thread-id-fix-metadata.diff
@@ -1,5 +1,5 @@
---- thread-id-3.3.0/Cargo.toml	2018-03-23T05:49:40-07:00
-+++ thread-id-3.3.0/Cargo.toml	2018-03-23T17:39:59.408637-07:00
+--- thread-id-3.3.0/Cargo.toml	2018-03-23T13:49:40+01:00
++++ thread-id-3.3.0/Cargo.toml	2018-10-27T23:58:09.354520+02:00
 @@ -15,9 +15,3 @@
  
  [target.'cfg(unix)'.dependencies]