From 3a9c660091ab93d1ac59d1c7c68bedaee2f1d3b7 Mon Sep 17 00:00:00 2001 From: Alzim Date: Fri, 17 Jul 2020 22:26:29 +0300 Subject: [PATCH] Updated to 1.45.0 --- .abf.yml | 8 ++++---- rust.spec | 16 +++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.abf.yml b/.abf.yml index 82f9d81..8e37d62 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,5 +1,5 @@ sources: - rust-1.43.1-aarch64-unknown-linux-gnu.tar.xz: 4c1ac665faf06284a2d830226f9ab2dded91e631 - rust-1.43.1-i686-unknown-linux-gnu.tar.xz: 91b65506f6a2dbb04c2927b7195b108eb4c51aeb - rust-1.43.1-x86_64-unknown-linux-gnu.tar.xz: 915568ae516f3ab35ac97f04bcc95e41e8f232a1 - rustc-1.44.1-src.tar.xz: a5276687cf61f884177aed3c7230f166bc87a9f0 + rust-1.44.0-aarch64-unknown-linux-gnu.tar.xz: 99735e094f28ae168907c902385f6df09c9545ac + rust-1.44.0-i686-unknown-linux-gnu.tar.xz: 96287d119e8008e13c09e421490a90cd8ed994ab + rust-1.44.0-x86_64-unknown-linux-gnu.tar.xz: 5bb798e722c7758454def598daec56362be0525c + rustc-1.45.0-src.tar.xz: 7447f361432a8c569eb5b5ab85b784a898dd61d2 diff --git a/rust.spec b/rust.spec index a874b68..cd1b7bf 100644 --- a/rust.spec +++ b/rust.spec @@ -25,9 +25,9 @@ # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24 # or nightly wants some beta-YYYY-MM-DD # Note that cargo matches the program version here, not its crate version. -%define bootstrap_rust 1.43.1 -%define bootstrap_cargo 1.43.1 -%define bootstrap_date 2020-05-07 +%define bootstrap_rust 1.44.0 +%define bootstrap_cargo 1.44.0 +%define bootstrap_date 2020-06-04 %bcond_without bootstrap @@ -65,7 +65,7 @@ Summary: The Rust Programming Language Name: rust -Version: 1.44.1 +Version: 1.45.0 Release: 1 License: (ASL 2.0 or MIT) and (BSD and MIT) Group: Development/Rust @@ -77,8 +77,6 @@ Source1: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-x86_64-unknown Source2: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz Source3: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz Source10: rust.rpmlintrc -# https://github.com/rust-lang/rust/pull/71782 -Patch1: rust-pr71782-Use-a-non-existent-test-path.patch BuildRequires: ncurses-devel BuildRequires: curl BuildRequires: pkgconfig(libcurl) @@ -128,9 +126,6 @@ This package includes the Rust compiler and documentation generator. %dir %{rustlibdir}/%{rust_triple} %dir %{rustlibdir}/%{rust_triple}/lib %{rustlibdir}/%{rust_triple}/lib/*.so -# %%exclude - No work! -#%%exclude %%{_bindir}/*miri -#%%{_bindir}/*miri #------------------------------------------------------------------------- @@ -363,8 +358,6 @@ test -f '%{local_rust_root}/bin/rustc' %setup -qn rustc-%{version}-src -%patch1 -p1 - # python3 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure @@ -432,6 +425,7 @@ export RUSTFLAGS="%{rustflags}" --disable-codegen-tests \ --disable-rpath \ --enable-extended \ + --tools=analysis,cargo,clippy,rls,rustfmt,src \ --enable-vendor \ --release-channel=stable \ %if %{mdkver} > 201610