From 5c434839a179c952e110dd09cac211e9163980a37e8a49e07eac72549949bae2 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Mon, 13 Feb 2017 04:23:24 +0000 Subject: [PATCH] Clean up previous modifications. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=62 --- rust.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/rust.spec b/rust.spec index 35b1b08..f52cc9d 100644 --- a/rust.spec +++ b/rust.spec @@ -63,25 +63,22 @@ Provides: rustc = %{version} Provides: rustc-stable = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le + %if 0%{?suse_version} BuildRequires: fdupes %endif -%if %{with bootstrap} + +%ifarch %{arm} aarch64 ppc64 ppc64le BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap == %{prev_version} %else - %ifarch %{arm} aarch64 ppc64 ppc64le +%if %{with bootstrap} || 0%{?leap_version} <= 420200 BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap == %{prev_version} - %else - %if 0%{?leap_version} == 420200 -BuildRequires: cargo-bootstrap -BuildRequires: rustc-bootstrap == %{prev_version} - %else +%else BuildRequires: cargo BuildRequires: rust == %{prev_version} - %endif - %endif +%endif %endif %description