From e0775a0719c476769fd7d4ee17b07c8a19d04dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Sat, 10 Nov 2018 00:20:19 +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>
---
 dirs-fix-metadata.diff |  4 ++--
 rust-dirs.spec         | 49 +++++++++++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/dirs-fix-metadata.diff b/dirs-fix-metadata.diff
index 3d2d63a..43618e2 100644
--- a/dirs-fix-metadata.diff
+++ b/dirs-fix-metadata.diff
@@ -1,5 +1,5 @@
---- dirs-1.0.4/Cargo.toml	1969-12-31T16:00:00-08:00
-+++ dirs-1.0.4/Cargo.toml	2018-09-27T16:58:11.799412-07:00
+--- dirs-1.0.4/Cargo.toml       1970-01-01T01:00:00+01:00
++++ dirs-1.0.4/Cargo.toml       2018-11-09T23:57:46.413545+01:00
 @@ -19,10 +19,5 @@
  keywords = ["xdg", "basedir", "app_dirs", "path", "folder"]
  license = "MIT OR Apache-2.0"
diff --git a/rust-dirs.spec b/rust-dirs.spec
index b4011e1..42e4032 100644
--- a/rust-dirs.spec
+++ b/rust-dirs.spec
@@ -6,7 +6,7 @@
 
 Name:           rust-%{crate}
 Version:        1.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Platform abstractions for common directories
 
 # Upstream license specification: MIT OR Apache-2.0
@@ -20,25 +20,42 @@ Patch0:         dirs-fix-metadata.diff
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0)
+BuildRequires:  (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0)
 
-%description
-%{summary}.
+%global _description \
+A tiny low-level library that provides platform-specific standard locations of\
+directories for config, cache and other data on Linux, Windows and macOS by\
+leveraging the mechanisms defined by the XDG base/user directory specifications\
+on Linux, the Known Folder API on Windows, and the Standard Directory\
+guidelines on macOS.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A tiny low-level library that provides platform-specific standard locations of
-directories for config, cache and other data on Linux, Windows and macOS by
-leveraging the mechanisms defined by the XDG base/user directory specifications
-on Linux, the Known Folder API on Windows, and the Standard Directory
-guidelines on macOS.
+%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-APACHE LICENSE-MIT
+%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
@@ -55,12 +72,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Fri Nov 09 2018 Robert-André Mauchin <zebob.m@gmail.com> - 1.0.4-2
+- Adapt to new packaging
+
 * Thu Sep 27 2018 Josh Stone <jistone@redhat.com> - 1.0.4-1
 - Update to 1.0.4