From 87d004618b011013b0d95a49fa95a7a93b6117c8 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 30 Oct 2018 08:57:20 +0100
Subject: [PATCH] Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rust-env_logger.spec | 67 +++++++++++++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 19 deletions(-)

diff --git a/rust-env_logger.spec b/rust-env_logger.spec
index e05efb4..8c6889e 100644
--- a/rust-env_logger.spec
+++ b/rust-env_logger.spec
@@ -1,5 +1,5 @@
 # Generated by rust2rpm
-# Tests are run in infrastructure
+# * Tests are run in infrastructure
 %bcond_with check
 %global debug_package %{nil}
 
@@ -7,9 +7,10 @@
 
 Name:           rust-%{crate}
 Version:        0.5.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Logging implementation for `log` which is configured via environment variable
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/env_logger
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
@@ -17,26 +18,56 @@ Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(atty) >= 0.2.5 with crate(atty) < 0.3.0)
-BuildRequires:  (crate(humantime) >= 1.1.0 with crate(humantime) < 2.0.0)
-BuildRequires:  ((crate(log) >= 0.4.0 with crate(log) < 0.5.0) with crate(log/std))
-BuildRequires:  (crate(regex) >= 1.0.3 with crate(regex) < 2.0.0)
-BuildRequires:  (crate(termcolor) >= 1.0.0 with crate(termcolor) < 2.0.0)
+BuildRequires:  (crate(atty/default) >= 0.2.5 with crate(atty/default) < 0.3.0)
+BuildRequires:  (crate(humantime/default) >= 1.1.0 with crate(humantime/default) < 2.0.0)
+BuildRequires:  (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0)
+BuildRequires:  (crate(log/std) >= 0.4.0 with crate(log/std) < 0.5.0)
+BuildRequires:  (crate(regex/default) >= 1.0.3 with crate(regex/default) < 2.0.0)
+BuildRequires:  (crate(termcolor/default) >= 1.0.0 with crate(termcolor/default) < 2.0.0)
+
+%global _description \
+A logging implementation for `log` which is configured via an environment\
+variable.
 
-%description
-%{summary}.
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A logging implementation for `log` which is configured via an environment
-variable.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+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 %{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}+regex-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+regex-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "regex" feature of "%{crate}" crate.
+
+%files       -n %{name}+regex-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -53,12 +84,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
+* Tue Oct 30 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.5.13-2
+- Adapt to new packaging
+
 * Thu Aug 30 2018 Josh Stone <jistone@redhat.com> - 0.5.13-1
 - Update to 0.5.13