From b925753ed94da8d04b1a92cdf0a95f230dbd6ae1318d7c136639d1c8753e0c09 Mon Sep 17 00:00:00 2001
From: Luke Jones <luke@ljones.dev>
Date: Mon, 6 Feb 2017 08:38:07 +0000
Subject: [PATCH] Correct the rust-triples by removing them for now. Rely on
 OBS - Remove rust-triples to rely on OBS

OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=37
---
 rust.changes |  5 +++++
 rust.spec    | 23 ++++-------------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/rust.changes b/rust.changes
index 38e527d..c9d8cb5 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  6 08:36:44 UTC 2017 - luke.nukem.jones@gmail.com
+
+- Remove rust-triples to rely on OBS
+
 -------------------------------------------------------------------
 Mon Feb  6 08:25:17 UTC 2017 - luke.nukem.jones@gmail.com
 
diff --git a/rust.spec b/rust.spec
index fa96b0a..3ea023c 100644
--- a/rust.spec
+++ b/rust.spec
@@ -18,18 +18,6 @@
 
 
 %global prev_version 1.14.0
-%global abi gnu
-%ifarch armv7hl
-%global arch armv7
-%global abi gnueabihf
-%endif
-%ifarch ppc64
-%global arch powerpc64
-%endif
-%ifarch ppc64le
-%global arch powerpc64le
-%endif
-%global rust_triple %{arch}-unknown-linux-%{abi}
 %bcond_with bootstrap
 Name:           rust
 Version:        1.15.0
@@ -50,9 +38,9 @@ BuildRequires:  gcc-c++
 BuildRequires:  llvm-devel
 BuildRequires:  procps
 BuildRequires:  python
+Recommends:     cargo
 Recommends:     %{name}-doc
 Recommends:     %{name}-std
-Recommends:     cargo
 Conflicts:      rustc-bootstrap
 Provides:       rustc = %{version}
 Provides:       rustc-stable = %{version}
@@ -124,9 +112,6 @@ invoking gdb on rust binaries.
 export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
 # FIXME: you should use the %%configure macro
 ./configure \
-    --build=%{rust_triple} \
-    --host=%{rust_triple} \
-    --target=%{rust_triple} \
     --enable-local-rust \
     --local-rust-root=%{_prefix} \
     --prefix=%{_prefix} \
@@ -186,9 +171,9 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \
 %files std
 %defattr(-,root,root)
 %dir %{_libdir}/rustlib
-%dir %{_libdir}/rustlib/%{rust_triple}
-%dir %{_libdir}/rustlib/%{rust_triple}/lib
-%{_libdir}/rustlib/%{rust_triple}/lib/*.rlib
+%dir %{_libdir}/rustlib/*-unknown-linux-*
+%dir %{_libdir}/rustlib/*-unknown-linux-*/lib
+%{_libdir}/rustlib/*-unknown-linux-*/lib/*.rlib
 
 %files gdb
 %defattr(-,root,root,-)