From bc1818d39b69bb8624bf3cada32b3e14d816476a Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 12 Nov 2018 16:00:52 -0800
Subject: [PATCH] Adapt to new packaging

---
 rust-git2-curl.spec | 54 ++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/rust-git2-curl.spec b/rust-git2-curl.spec
index 3b44353..f252061 100644
--- a/rust-git2-curl.spec
+++ b/rust-git2-curl.spec
@@ -7,7 +7,7 @@
 
 Name:           rust-%{crate}
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Backend for an HTTP transport in libgit2 powered by libcurl
 
 # Upstream license specification: MIT/Apache-2.0
@@ -18,33 +18,48 @@ Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(curl) >= 0.4.0 with crate(curl) < 0.5.0)
+BuildRequires:  (crate(curl/default) >= 0.4.0 with crate(curl/default) < 0.5.0)
 BuildRequires:  (crate(git2) >= 0.7.0 with crate(git2) < 0.8.0)
-BuildRequires:  (crate(log) >= 0.4.0 with crate(log) < 0.5.0)
-BuildRequires:  (crate(url) >= 1.0.0 with crate(url) < 2.0.0)
+BuildRequires:  (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0)
+BuildRequires:  (crate(url/default) >= 1.0.0 with crate(url/default) < 2.0.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(civet) >= 0.11.0 with crate(civet) < 0.12.0)
-BuildRequires:  (crate(conduit) >= 0.8.0 with crate(conduit) < 0.9.0)
-BuildRequires:  (crate(conduit-git-http-backend) >= 0.8.0 with crate(conduit-git-http-backend) < 0.9.0)
-BuildRequires:  (crate(tempfile) >= 3.0.0 with crate(tempfile) < 4.0.0)
+BuildRequires:  (crate(civet/default) >= 0.11.0 with crate(civet/default) < 0.12.0)
+BuildRequires:  (crate(conduit-git-http-backend/default) >= 0.8.0 with crate(conduit-git-http-backend/default) < 0.9.0)
+BuildRequires:  (crate(conduit/default) >= 0.8.0 with crate(conduit/default) < 0.9.0)
+BuildRequires:  (crate(tempfile/default) >= 3.0.0 with crate(tempfile/default) < 4.0.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Backend for an HTTP transport in libgit2 powered by libcurl.\
+\
+Intended to be used with the git2 crate.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Backend for an HTTP transport in libgit2 powered by libcurl.
+%description    devel %{_description}
 
-Intended to be used with the git2 crate.
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%{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
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -61,11 +76,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Mon Nov 12 2018 Josh Stone <jistone@redhat.com> - 0.8.2-2
+- Adapt to new packaging
+
 * Thu Oct 11 2018 Josh Stone <jistone@redhat.com> - 0.8.2-1
 - Update to 0.8.2