From 2c0d88b8e467b0eda82fec145497e0446c89982a7613598693bb7fcd56ba7e05 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Wed, 10 May 2017 07:11:46 +0000 Subject: [PATCH] Accepting request 494000 from home:luke_nukem:branches:devel:languages:rust Fix dependencies OBS-URL: https://build.opensuse.org/request/show/494000 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=107 --- rust.changes | 6 ++++++ rust.spec | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/rust.changes b/rust.changes index 1eebcf5..ef239b5 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 10 07:09:13 UTC 2017 - luke.nukem.jones@gmail.com + +- Adjustment of rust version dependency to prevent inability to + build in the adi rings. + ------------------------------------------------------------------- Sun Apr 30 04:48:19 UTC 2017 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index 911fff4..40a6a23 100644 --- a/rust.spec +++ b/rust.spec @@ -92,11 +92,14 @@ 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: rust-std-bootstrap == %{prev_rust} -BuildRequires: rustc-bootstrap == %{prev_rust} +BuildRequires: rust-std-bootstrap = %{prev_rust} +BuildRequires: rustc-bootstrap = %{prev_rust} %else -BuildRequires: rust == %{prev_rust} -BuildRequires: rust-std == %{prev_rust} +# if there is a package choice, use prefer version in prjconfig +BuildRequires: rust <= %{version} +BuildRequires: rust >= %{prev_rust} +BuildRequires: rust-std <= %{version} +BuildRequires: rust-std >= %{prev_rust} %endif %description