diff --git a/rayon-core-1.4.1-fix-metadata.diff b/rayon-core-1.4.1-fix-metadata.diff deleted file mode 100644 index 8726bf9..0000000 --- a/rayon-core-1.4.1-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- rayon-core-1.4.1/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ rayon-core-1.4.1/Cargo.toml 2018-07-16T22:18:30.971732-07:00 -@@ -45,7 +45,7 @@ - name = "simple_panic" - path = "tests/simple_panic.rs" - [dependencies.crossbeam-deque] --version = "0.2.0" -+version = "0.4" - - [dependencies.lazy_static] - version = "1" diff --git a/rayon-core-fix-metadata.diff b/rayon-core-fix-metadata.diff new file mode 100644 index 0000000..f141be8 --- /dev/null +++ b/rayon-core-fix-metadata.diff @@ -0,0 +1,11 @@ +--- rayon-core-1.4.1/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ rayon-core-1.4.1/Cargo.toml 2018-10-28T02:33:49.374552+02:00 +@@ -45,7 +45,7 @@ + name = "simple_panic" + path = "tests/simple_panic.rs" + [dependencies.crossbeam-deque] +-version = "0.2.0" ++version = "0.4.0" + + [dependencies.lazy_static] + version = "1" diff --git a/rust-rayon-core.spec b/rust-rayon-core.spec index 4430a23..5c90bd2 100644 --- a/rust-rayon-core.spec +++ b/rust-rayon-core.spec @@ -1,6 +1,6 @@ # Generated by rust2rpm -# Some tests don't work with optimized builds -# https://github.com/rayon-rs/rayon/issues/585 +# * Some tests don't work with optimized builds +# https://github.com/rayon-rs/rayon/issues/585 %bcond_with check %global debug_package %{nil} @@ -8,41 +8,58 @@ Name: rust-%{crate} Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core APIs for Rayon +# Upstream license specification: Apache-2.0/MIT License: ASL 2.0 or MIT URL: https://crates.io/crates/rayon-core Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate # Initial patched metadata # * Bump crossbeam-deque to 0.4, upstream doesn't want this -Patch0: rayon-core-1.4.1-fix-metadata.diff +Patch0: rayon-core-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(crossbeam-deque) >= 0.4.0 with crate(crossbeam-deque) < 0.5.0) -BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0) -BuildRequires: (crate(libc) >= 0.2.16 with crate(libc) < 0.3.0) -BuildRequires: (crate(num_cpus) >= 1.2.0 with crate(num_cpus) < 2.0.0) +BuildRequires: (crate(crossbeam-deque/default) >= 0.4.0 with crate(crossbeam-deque/default) < 0.5.0) +BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) +BuildRequires: (crate(libc/default) >= 0.2.16 with crate(libc/default) < 0.3.0) +BuildRequires: (crate(num_cpus/default) >= 1.2.0 with crate(num_cpus/default) < 2.0.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(rand) >= 0.5.0 with crate(rand) < 0.6.0) +BuildRequires: (crate(rand/default) >= 0.5.0 with crate(rand/default) < 0.6.0) %endif -%description -%{summary}. +%global _description \ +Core APIs for Rayon. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -Core APIs for Rayon. +%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}/ + +%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 +76,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-APACHE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sun Oct 28 2018 Igor Gnatenko - 1.4.1-2 +- Adapt to new packaging + * Tue Jul 17 2018 Josh Stone - 1.4.1-1 - Update to 1.4.1