From 6127953b009eeca38b9cc83ffa7eb1e255f49fe4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Oct 28 2018 00:29:29 +0000 Subject: Adapt to new packaging Signed-off-by: Igor Gnatenko --- diff --git a/crossbeam-deque-fix-metadata.diff b/crossbeam-deque-fix-metadata.diff index 27089a3..8d99a43 100644 --- a/crossbeam-deque-fix-metadata.diff +++ b/crossbeam-deque-fix-metadata.diff @@ -1,5 +1,5 @@ --- crossbeam-deque-0.4.1/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ crossbeam-deque-0.4.1/Cargo.toml 2018-09-08T12:13:04.296155+02:00 ++++ crossbeam-deque-0.4.1/Cargo.toml 2018-10-28T02:28:32.432268+02:00 @@ -26,7 +26,7 @@ version = "0.5.0" diff --git a/rust-crossbeam-deque0.4.spec b/rust-crossbeam-deque0.4.spec index 56edaf8..3c0d05d 100644 --- a/rust-crossbeam-deque0.4.spec +++ b/rust-crossbeam-deque0.4.spec @@ -7,7 +7,7 @@ Name: rust-%{crate}0.4 Version: 0.4.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Concurrent work-stealing deque # Upstream license specification: MIT/Apache-2.0 @@ -23,26 +23,42 @@ Patch0001: crossbeam-deque-update-crossbeam-utils.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(crossbeam-epoch) >= 0.5.0 with crate(crossbeam-epoch) < 0.6.0) -BuildRequires: (crate(crossbeam-utils) >= 0.5.0 with crate(crossbeam-utils) < 0.6.0) +BuildRequires: (crate(crossbeam-epoch/default) >= 0.5.0 with crate(crossbeam-epoch/default) < 0.6.0) +BuildRequires: (crate(crossbeam-utils/default) >= 0.5.0 with crate(crossbeam-utils/default) < 0.6.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(rand) >= 0.4.0 with crate(rand) < 0.5.0) +BuildRequires: (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0) %endif -%description -%{summary}. +%global _description \ +Concurrent work-stealing deque. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -Concurrent work-stealing deque. +%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 CHANGELOG.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 @@ -59,12 +75,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md CHANGELOG.md -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sun Oct 28 2018 Igor Gnatenko - 0.4.1-6 +- Adapt to new packaging + * Sun Oct 07 2018 Igor Gnatenko - 0.4.1-5 - Run tests in infrastructure