Luke Jones 2017-04-28 11:14:03 +00:00 committed by Git OBS Bridge
parent 8abbd328cc
commit 445e4444f7

View File

@ -18,7 +18,8 @@
%global prev_rust 1.16.0
%global prev_cargo 0.16.0
%global prev_cargo 0.17.0
%global curr_cargo 0.18.0
%global abi gnu
%ifarch s390x
%global _arch s390x
@ -82,12 +83,13 @@ BuildRequires: fdupes
# There are no successful builds for less than TW or Leap 42.2, so bootstrap
# until such time that there is.
%if %{with rust_bootstrap} || (0%{?suse_version} < 1330 && 0%{?sle_version} <= 120100)
BuildRequires: cargo-bootstrap >= %{prev_cargo}
BuildRequires: cargo-bootstrap == %{prev_cargo}
BuildRequires: rust-std-bootstrap == %{prev_rust}
BuildRequires: rustc-bootstrap == %{prev_rust}
%else
# Require exact versions to help prevent OBS build loops
BuildRequires: cargo == %{prev_cargo}
# Building with either current of previous version depending on which is available
BuildRequires: cargo <= %{curr_cargo}
BuildRequires: cargo >= %{prev_cargo}
BuildRequires: rust <= %{version}
BuildRequires: rust >= %{prev_rust}
BuildRequires: rust-std <= %{version}