From a55e4410bcff58f31391bc5b15bb69400eddd2f4 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Jun 13 2019 04:07:08 +0000 Subject: Update to 1.1.0 --- diff --git a/.gitignore b/.gitignore index 114b518..2281d55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /rayon-1.0.1.crate /rayon-1.0.2.crate /rayon-1.0.3.crate +/rayon-1.1.0.crate diff --git a/rayon-fix-metadata.diff b/rayon-fix-metadata.diff index d434bad..73572ee 100644 --- a/rayon-fix-metadata.diff +++ b/rayon-fix-metadata.diff @@ -1,11 +1,11 @@ ---- rayon-1.0.3/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ rayon-1.0.3/Cargo.toml 2018-11-02T15:03:06.568806-07:00 -@@ -24,7 +24,7 @@ +--- rayon-1.1.0/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ rayon-1.1.0/Cargo.toml 2019-06-13T03:54:14.977625+00:00 +@@ -23,7 +23,7 @@ license = "Apache-2.0/MIT" repository = "https://github.com/rayon-rs/rayon" [dependencies.crossbeam-deque] --version = "0.2.0" -+version = "0.4.0" +-version = "0.6.3" ++version = "0.7.1" [dependencies.either] version = "1.0" diff --git a/rust-rayon.spec b/rust-rayon.spec index 1e393dd..9b8a976 100644 --- a/rust-rayon.spec +++ b/rust-rayon.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm +# Generated by rust2rpm 9 # * Some tests are broken on non-x86_64 # https://github.com/rayon-rs/rayon/issues/585 %bcond_with check @@ -7,8 +7,8 @@ %global crate rayon Name: rust-%{crate} -Version: 1.0.3 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Simple work-stealing parallelism for Rust # Upstream license specification: Apache-2.0/MIT @@ -16,22 +16,31 @@ License: ASL 2.0 or MIT URL: https://crates.io/crates/rayon Source: %{crates_source} # Initial patched metadata -# * Bump crossbeam-deque to 0.4, upstream doesn't want this +# * Bump crossbeam-deque to 0.7, upstream doesn't want this Patch0: rayon-fix-metadata.diff +# https://github.com/rayon-rs/rayon/compare/master...cuviper:crossbeam-deque-0.7 +Patch1: 0001-Update-to-crossbeam-deque-0.7.patch ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(crossbeam-deque/default) >= 0.4.0 with crate(crossbeam-deque/default) < 0.5.0) +%if ! %{__cargo_skip_build} +BuildRequires: (crate(crossbeam-deque/default) >= 0.7.1 with crate(crossbeam-deque/default) < 0.8.0) BuildRequires: (crate(either) >= 1.0.0 with crate(either) < 2.0.0) -BuildRequires: (crate(rayon-core/default) >= 1.4.0 with crate(rayon-core/default) < 2.0.0) +BuildRequires: (crate(rayon-core/default) >= 1.5.0 with crate(rayon-core/default) < 2.0.0) %if %{with check} +BuildRequires: (crate(doc-comment/default) >= 0.3.0 with crate(doc-comment/default) < 0.4.0) BuildRequires: (crate(docopt/default) >= 1.0.0 with crate(docopt/default) < 2.0.0) BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) -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) +BuildRequires: (crate(rand_xorshift/default) >= 0.1.0 with crate(rand_xorshift/default) < 0.2.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) %endif +%endif %global _description \ Simple work-stealing parallelism for Rust. @@ -80,6 +89,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Thu Jun 13 2019 Josh Stone - 1.1.0-1 +- Update to 1.1.0 + * Sun Mar 10 2019 Igor Gnatenko - 1.0.3-3 - Adapt to new packaging diff --git a/sources b/sources index 145a023..b2f4d43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rayon-1.0.3.crate) = bd23dbcd8b17061e0623df01af141d0e51532b46ef360ddbd392f4992d6b62fda26255cd9908f853a5a4c3cf111f6c9224a97abb0a3f9754aa0ed79ac58392f7 +SHA512 (rayon-1.1.0.crate) = 6727fb0c2039d196f76c1844395393c0bdf0590f443419d55f2bf5414df98338ba0269d31d8c4531f7b02e473fdcff90eb123cd426e9561858b9d0c028f3b825