Accepting request 447471 from home:luke_nukem:branches:devel:languages:rust

* update to v1.14.0
* cleanup spec
* build archv7hl using bootstrap binary since no previous package builds were successful

OBS-URL: https://build.opensuse.org/request/show/447471
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=22

rust.spec

@@ -16,10 +16,10 @@
 #
 
 
-%global prev_version 1.12.1
+%global prev_version 1.13.0
 %bcond_with bootstrap
 Name:           rust
-Version:        1.13.0
+Version:        1.14.0
 Release:        0
 Summary:        A systems programming language
 License:        MIT or Apache-2.0
@@ -29,8 +29,6 @@ Source0:        https://static.rust-lang.org/dist/rustc-%{version}-src.tar.gz
 Source100:      %{name}-rpmlintrc
 # PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs
 Patch1:         add-soname.patch
-# PATCH-FIX-UPSTREAM build armv7 on armv7
-Patch2:         0001-Fix-armv7-autodetection.patch
 BuildRequires:  cmake
 BuildRequires:  curl
 BuildRequires:  gcc-c++
@@ -52,9 +50,15 @@ BuildRequires:  fdupes
 BuildRequires:  rustc-bootstrap <= %{prev_version}
 BuildRequires:  rustc-bootstrap >= %{prev_version}
 %else
+%ifnarch armv7hl
 BuildRequires:  rust <= %{version}
 BuildRequires:  rust >= %{prev_version}
 %endif
+%ifarch armv7hl
+BuildRequires:  rustc-bootstrap <= %{prev_version}
+BuildRequires:  rustc-bootstrap >= %{prev_version}
+%endif
+%endif
 
 %description
 Rust is a systems programming language focused on three goals:
@@ -97,20 +101,9 @@ Provides:       rustc-1_10-gdb <= %{version}
 This subpackage provides pretty printers and a wrapper script for
 invoking gdb on rust binaries.
 
-%if %{with bootstrap_tarball}
-%package bootstrap-tarball
-Summary:        Bootstrap tarball with rust binaries
-Group:          Development/Languages/Other
-
-%description bootstrap-tarball
-This subpackage provides tarball with rust binaries used for rust-bootstrap
-package.
-%endif
-
 %prep
 %setup -q -n rustc-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint