Adapt to new packaging

rust-rustfix.spec

@@ -7,7 +7,7 @@
 
 Name:           rust-%{crate}
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Automatically apply the suggestions made by rustc
 
 # Upstream license specification: Apache-2.0/MIT
@@ -21,34 +21,51 @@ Patch0:         rustfix-fix-metadata.diff
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(failure) >= 0.1.1 with crate(failure) < 0.2.0)
-BuildRequires:  (crate(log) >= 0.4.1 with crate(log) < 0.5.0)
-BuildRequires:  (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0)
-BuildRequires:  (crate(serde_derive) >= 1.0.0 with crate(serde_derive) < 2.0.0)
-BuildRequires:  (crate(serde_json) >= 1.0.0 with crate(serde_json) < 2.0.0)
+BuildRequires:  (crate(failure/default) >= 0.1.1 with crate(failure/default) < 0.2.0)
+BuildRequires:  (crate(log/default) >= 0.4.1 with crate(log/default) < 0.5.0)
+BuildRequires:  (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0)
+BuildRequires:  (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0)
+BuildRequires:  (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(difference) >= 2.0.0 with crate(difference) < 3.0.0)
-BuildRequires:  (crate(duct) >= 0.9.0 with crate(duct) < 0.10.0)
-BuildRequires:  (crate(env_logger) >= 0.5.0 with crate(env_logger) < 0.6.0)
-BuildRequires:  (crate(log) >= 0.4.1 with crate(log) < 0.5.0)
-BuildRequires:  (crate(proptest) >= 0.7.0 with crate(proptest) < 0.8.0)
-BuildRequires:  (crate(tempdir) >= 0.3.5 with crate(tempdir) < 0.4.0)
+BuildRequires:  (crate(difference/default) >= 2.0.0 with crate(difference/default) < 3.0.0)
+BuildRequires:  (crate(duct/default) >= 0.9.0 with crate(duct/default) < 0.10.0)
+BuildRequires:  (crate(env_logger/default) >= 0.5.0 with crate(env_logger/default) < 0.6.0)
+BuildRequires:  (crate(log/default) >= 0.4.1 with crate(log/default) < 0.5.0)
+BuildRequires:  (crate(proptest/default) >= 0.7.0 with crate(proptest/default) < 0.8.0)
+BuildRequires:  (crate(tempdir/default) >= 0.3.5 with crate(tempdir/default) < 0.4.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+Automatically apply the suggestions made by rustc.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-Automatically apply the suggestions made by rustc.
+%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}/
+%exclude %{cargo_registry}/%{crate}-%{version}/bors.toml
+
+%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
@@ -65,12 +82,9 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc Readme.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/bors.toml
-
 %changelog
+* Mon Nov 12 2018 Josh Stone <jistone@redhat.com> - 0.4.2-2
+- Adapt to new packaging
+
 * Sun Oct 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.2-1
 - Initial package