diff --git a/rust-humantime.spec b/rust-humantime.spec index 15404df..8fac816 100644 --- a/rust-humantime.spec +++ b/rust-humantime.spec @@ -7,37 +7,55 @@ Name: rust-%{crate} Version: 1.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parser and formatter for std::time::{Duration, SystemTime} -License: ASL 2.0 or MIT +# Upstream license specification: MIT/Apache-2.0 +License: MIT or ASL 2.0 URL: https://crates.io/crates/humantime Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(quick-error) >= 1.0.0 with crate(quick-error) < 2.0.0) +BuildRequires: (crate(quick-error/default) >= 1.0.0 with crate(quick-error/default) < 2.0.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(chrono) >= 0.4.0 with crate(chrono) < 0.5.0) -BuildRequires: (crate(rand) >= 0.4.2 with crate(rand) < 0.5.0) -BuildRequires: (crate(time) >= 0.1.39 with crate(time) < 0.2.0) +BuildRequires: (crate(chrono/default) >= 0.4.0 with crate(chrono/default) < 0.5.0) +BuildRequires: (crate(rand/default) >= 0.4.2 with crate(rand/default) < 0.5.0) +BuildRequires: (crate(time/default) >= 0.1.39 with crate(time/default) < 0.2.0) %endif -%description -%{summary}. +%global _description \ +A parser and formatter for std::time::{Duration, SystemTime}. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -A parser and formatter for std::time::{Duration, SystemTime}. +%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}/ +%exclude %{cargo_registry}/%{crate}-%{version}/{bulk,vagga}.yaml + +%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 @@ -54,13 +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}/ -%exclude %{cargo_registry}/%{crate}-%{version}/{bulk,vagga}.yaml - %changelog +* Tue Oct 30 2018 Josh Stone - 1.1.1-4 +- Adapt to new packaging + * Sat Aug 04 2018 Igor Gnatenko - 1.1.1-3 - Run tests in infrastructure