diff --git a/.gitignore b/.gitignore index d0034ff..286a9c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /crossbeam-0.3.0.crate /crossbeam-0.3.2.crate /crossbeam-0.4.1.crate +/crossbeam-0.5.0.crate diff --git a/crossbeam-fix-metadata.diff b/crossbeam-fix-metadata.diff index cded320..2312b6d 100644 --- a/crossbeam-fix-metadata.diff +++ b/crossbeam-fix-metadata.diff @@ -1,8 +1,18 @@ ---- crossbeam-0.4.1/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ crossbeam-0.4.1/Cargo.toml 2018-09-08T23:41:51.896701+02:00 -@@ -38,5 +38,4 @@ +--- crossbeam-0.5.0/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ crossbeam-0.5.0/Cargo.toml 2018-12-15T10:12:31.913054+01:00 +@@ -45,13 +45,12 @@ + version = "1.8.0" + + [dependencies.parking_lot] +-version = "0.6.4" ++version = "0.7" + [dev-dependencies.rand] +-version = "0.5" ++version = "0.6" [features] - default = ["use_std"] + default = ["std"] -nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly"] - use_std = ["crossbeam-epoch/use_std", "crossbeam-utils/use_std"] + std = ["crossbeam-epoch/std", "crossbeam-utils/std"] + [badges.travis-ci] + repository = "crossbeam-rs/crossbeam" diff --git a/rust-crossbeam.spec b/rust-crossbeam.spec index 3d8a585..9cd8c2d 100644 --- a/rust-crossbeam.spec +++ b/rust-crossbeam.spec @@ -5,8 +5,8 @@ %global crate crossbeam Name: rust-%{crate} -Version: 0.4.1 -Release: 2%{?dist} +Version: 0.5.0 +Release: 1%{?dist} Summary: Support for concurrent programming # Upstream license specification: MIT/Apache-2.0 @@ -15,19 +15,24 @@ URL: https://crates.io/crates/crossbeam Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate # Initial patched metadata # * No nightly +# * Bump rand to 0.6, parking_lot to 0.7 Patch0: crossbeam-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -BuildRequires: (crate(crossbeam-channel/default) >= 0.2.0 with crate(crossbeam-channel/default) < 0.3.0) -BuildRequires: (crate(crossbeam-deque/default) >= 0.5.0 with crate(crossbeam-deque/default) < 0.6.0) -BuildRequires: (crate(crossbeam-epoch/default) >= 0.5.0 with crate(crossbeam-epoch/default) < 0.6.0) -BuildRequires: (crate(crossbeam-epoch/use_std) >= 0.5.0 with crate(crossbeam-epoch/use_std) < 0.6.0) -BuildRequires: (crate(crossbeam-utils/default) >= 0.5.0 with crate(crossbeam-utils/default) < 0.6.0) -BuildRequires: (crate(crossbeam-utils/use_std) >= 0.5.0 with crate(crossbeam-utils/use_std) < 0.6.0) +BuildRequires: (crate(cfg-if/default) >= 0.1.0 with crate(cfg-if/default) < 0.2.0) +BuildRequires: (crate(crossbeam-channel/default) >= 0.3.0 with crate(crossbeam-channel/default) < 0.4.0) +BuildRequires: (crate(crossbeam-deque/default) >= 0.6.0 with crate(crossbeam-deque/default) < 0.7.0) +BuildRequires: (crate(crossbeam-epoch/default) >= 0.6.0 with crate(crossbeam-epoch/default) < 0.7.0) +BuildRequires: (crate(crossbeam-epoch/std) >= 0.6.0 with crate(crossbeam-epoch/std) < 0.7.0) +BuildRequires: (crate(crossbeam-utils/default) >= 0.6.0 with crate(crossbeam-utils/default) < 0.7.0) +BuildRequires: (crate(crossbeam-utils/std) >= 0.6.0 with crate(crossbeam-utils/std) < 0.7.0) +BuildRequires: (crate(lazy_static/default) >= 1.1.0 with crate(lazy_static/default) < 2.0.0) +BuildRequires: (crate(num_cpus/default) >= 1.8.0 with crate(num_cpus/default) < 2.0.0) +BuildRequires: (crate(parking_lot/default) >= 0.7.0 with crate(parking_lot/default) < 0.8.0) %if %{with check} -BuildRequires: (crate(rand/default) >= 0.5.0 with crate(rand/default) < 0.6.0) +BuildRequires: (crate(rand/default) >= 0.6.0 with crate(rand/default) < 0.7.0) %endif %global _description \ @@ -49,8 +54,6 @@ which use "%{crate}" crate. %license LICENSE-APACHE LICENSE-MIT %doc README.md CHANGELOG.md %{cargo_registry}/%{crate}-%{version}/ -# https://github.com/aturon/crossbeam/issues/111 -%exclude %{_bindir}/{stress-msq,bench} %package -n %{name}+default-devel Summary: %{summary} @@ -64,16 +67,16 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml -%package -n %{name}+use_std-devel +%package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+use_std-devel %{_description} +%description -n %{name}+std-devel %{_description} This package contains library source intended for building other packages -which use "use_std" feature of "%{crate}" crate. +which use "std" feature of "%{crate}" crate. -%files -n %{name}+use_std-devel +%files -n %{name}+std-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep @@ -92,6 +95,9 @@ which use "use_std" feature of "%{crate}" crate. %endif %changelog +* Sat Dec 15 2018 Igor Gnatenko - 0.5.0-1 +- Update to 0.5.0 + * Tue Nov 13 2018 Josh Stone - 0.4.1-2 - Adapt to new packaging diff --git a/sources b/sources index 975d8e0..e0a7722 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crossbeam-0.4.1.crate) = 026ba3b96057f073140528b99f253aec74e65aff05fc19649f54d53cf07d8f2ac4c84908a0f4462840801caf77ba2019f922ded310396066880e88caa095fbf1 +SHA512 (crossbeam-0.5.0.crate) = 2c0266a485f90ef9eb1a217e6f3833471dcfe0520e1e7fd01503aaddcd59aebcb733f9a1e7a98481a796dd031835d855d1138a5315ee96445ccf5b9d61fa53dc