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

- Separate the bootstrap version from the minimum required system
  version for package builds.

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

rust.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar  6 09:07:43 UTC 2019 - Luke Jones <jones_ld@protonmail.com>
+
+- Separate the bootstrap version from the minimum required system
+  version for package builds.
+
 -------------------------------------------------------------------
 Mon Mar  4 08:17:43 UTC 2019 - Luke Jones <jones_ld@protonmail.com>
 

rust.spec

@@ -17,7 +17,9 @@
 #
 
 
-%global prev_rust 1.32.0
+%global version_current 1.33.0
+%global version_previous 1.32.0
+%global version_bootstrap 1.32.0
 # some sub-packages are versioned independantly
 %global rustfmt_version 1.0.0
 %global rls_version 1.31.6
@@ -79,7 +81,7 @@
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
 
 Name:           rust
-Version:        1.33.0
+Version:        %{version_current}
 Release:        0
 Summary:        A systems programming language
 License:        MIT OR Apache-2.0
@@ -87,14 +89,14 @@ Group:          Development/Languages/Rust
 Url:            https://www.rust-lang.org
 Source0:        %{dl_url}/rustc-%{version}-src.tar.xz
 Source99:       %{name}-rpmlintrc
-Source100:      %{dl_url}/rust-%{prev_rust}-x86_64-unknown-linux-gnu.tar.xz
+Source100:      %{dl_url}/rust-%{version_bootstrap}-x86_64-unknown-linux-gnu.tar.xz
-Source101:      %{dl_url}/rust-%{prev_rust}-i686-unknown-linux-gnu.tar.xz
+Source101:      %{dl_url}/rust-%{version_bootstrap}-i686-unknown-linux-gnu.tar.xz
-Source102:      %{dl_url}/rust-%{prev_rust}-aarch64-unknown-linux-gnu.tar.xz
+Source102:      %{dl_url}/rust-%{version_bootstrap}-aarch64-unknown-linux-gnu.tar.xz
-Source103:      %{dl_url}/rust-%{prev_rust}-armv7-unknown-linux-gnueabihf.tar.xz
+Source103:      %{dl_url}/rust-%{version_bootstrap}-armv7-unknown-linux-gnueabihf.tar.xz
-Source104:      %{dl_url}/rust-%{prev_rust}-arm-unknown-linux-gnueabihf.tar.xz
+Source104:      %{dl_url}/rust-%{version_bootstrap}-arm-unknown-linux-gnueabihf.tar.xz
-Source105:      %{dl_url}/rust-%{prev_rust}-powerpc64-unknown-linux-gnu.tar.xz
+Source105:      %{dl_url}/rust-%{version_bootstrap}-powerpc64-unknown-linux-gnu.tar.xz
-Source106:      %{dl_url}/rust-%{prev_rust}-powerpc64le-unknown-linux-gnu.tar.xz
+Source106:      %{dl_url}/rust-%{version_bootstrap}-powerpc64le-unknown-linux-gnu.tar.xz
-Source107:      %{dl_url}/rust-%{prev_rust}-s390x-unknown-linux-gnu.tar.xz
+Source107:      %{dl_url}/rust-%{version_bootstrap}-s390x-unknown-linux-gnu.tar.xz
 # PATCH-FIX-OPENSUSE: edit src/librustc_llvm/build.rs to ignore GCC incompatible flag
 Patch0:         ignore-Wstring-conversion.patch
 # PATCH-FIX-OPENSUSE: replace depreciated trim_left_matches with trim_start_matches
@@ -144,13 +146,13 @@ BuildRequires:  llvm-devel >= 7.0
 %if !%with rust_bootstrap
 # We will now package cargo using the version number of rustc since
 # it is being built from rust sources. Old cargo packages have a 0.x number
-BuildRequires:  cargo <= %{version}
+BuildRequires:  cargo <= %{version_current}
-BuildRequires:  cargo >= %{prev_rust}
+BuildRequires:  cargo >= %{version_previous}
-BuildRequires:  rust <= %{version}
+BuildRequires:  rust <= %{version_current}
-BuildRequires:  rust >= %{prev_rust}
+BuildRequires:  rust >= %{version_previous}
 # This must be bumped to rust-std-static after 1.27.2 is in mainstream
-BuildRequires:  rust-std-static <= %{version}
+BuildRequires:  rust-std-static <= %{version_current}
-BuildRequires:  rust-std-static >= %{prev_rust}
+BuildRequires:  rust-std-static >= %{version_previous}
 %endif
 
 %description