diff --git a/crossbeam-fix-metadata.diff b/crossbeam-fix-metadata.diff deleted file mode 100644 index faef41d..0000000 --- a/crossbeam-fix-metadata.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- crossbeam-0.7.1/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ crossbeam-0.7.1/Cargo.toml 2019-02-10T16:31:32.788006+01:00 -@@ -45,7 +45,6 @@ - - [features] - default = ["std"] --nightly = ["crossbeam-epoch/nightly", "crossbeam-utils/nightly"] - 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 2a6dba5..ae0fdd4 100644 --- a/rust-crossbeam.spec +++ b/rust-crossbeam.spec @@ -1,40 +1,28 @@ -# Generated by rust2rpm -# * Tests are run in infrastructure -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil} %global crate crossbeam Name: rust-%{crate} Version: 0.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for concurrent programming # Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/crossbeam Source: %{crates_source} -# Initial patched metadata -# * No nightly -Patch0: crossbeam-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(cfg-if/default) >= 0.1.0 with crate(cfg-if/default) < 0.2.0) -BuildRequires: (crate(crossbeam-channel/default) >= 0.3.7 with crate(crossbeam-channel/default) < 0.4.0) -BuildRequires: (crate(crossbeam-deque/default) >= 0.7.0 with crate(crossbeam-deque/default) < 0.8.0) -BuildRequires: (crate(crossbeam-epoch/default) >= 0.7.1 with crate(crossbeam-epoch/default) < 0.8.0) -BuildRequires: (crate(crossbeam-epoch/std) >= 0.7.1 with crate(crossbeam-epoch/std) < 0.8.0) -BuildRequires: (crate(crossbeam-queue/default) >= 0.1.0 with crate(crossbeam-queue/default) < 0.2.0) -BuildRequires: (crate(crossbeam-utils/default) >= 0.6.5 with crate(crossbeam-utils/default) < 0.7.0) -BuildRequires: (crate(crossbeam-utils/std) >= 0.6.5 with crate(crossbeam-utils/std) < 0.7.0) -%if %{with check} -BuildRequires: (crate(rand/default) >= 0.6.0 with crate(rand/default) < 0.7.0) -%endif -%global _description \ -Tools for concurrent programming. +%global _description %{expand: +Tools for concurrent programming.} %description %{_description} @@ -64,6 +52,18 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+nightly-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+nightly-devel %{_description} + +This package contains library source intended for building other packages +which use "nightly" feature of "%{crate}" crate. + +%files -n %{name}+nightly-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+std-devel Summary: %{summary} BuildArch: noarch @@ -80,6 +80,9 @@ which use "std" feature of "%{crate}" crate. %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires + %build %cargo_build @@ -92,6 +95,9 @@ which use "std" feature of "%{crate}" crate. %endif %changelog +* Sun Jul 21 09:03:42 CEST 2019 Igor Gnatenko - 0.7.1-2 +- Regenerate + * Sun Feb 10 2019 Igor Gnatenko - 0.7.1-1 - Update to 0.7.1