From 44abe44e36f3ff93a620fdfae9336afa19782ef3 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 28 Jan 2025 00:21:42 +0000 Subject: [PATCH] import UBI rust-1.79.0-3.module+el8.10.0+22631+033aed0e --- .gitignore | 2 +- SOURCES/macros.rust-toolset | 17 +++++++---------- SPECS/rust.spec | 5 ++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index b18d27d..389f046 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/rustc-1.79.0-src.tar.xz -SOURCES/wasi-libc-wasi-sdk-22.tar.gz \ No newline at end of file +SOURCES/wasi-libc-wasi-sdk-22.tar.gz diff --git a/SOURCES/macros.rust-toolset b/SOURCES/macros.rust-toolset index be5a2c9..3f75b70 100644 --- a/SOURCES/macros.rust-toolset +++ b/SOURCES/macros.rust-toolset @@ -154,16 +154,13 @@ EOF}\ # of a specific binary has been installed, but which conflicts between builds # of different Rust applications and is not needed when building RPM packages. %cargo_install\ -(\ -set -euo pipefail \ - %{shrink: \ - %{__cargo} install \ - %{__cargo_common_opts} \ - --profile rpm \ - --no-track \ - --path . \ - } \ -) +%{shrink: \ + %{__cargo} install \ + %{__cargo_common_opts} \ + --profile rpm \ + --no-track \ + --path . \ +} # cargo_license: print license information for all crate dependencies # diff --git a/SPECS/rust.spec b/SPECS/rust.spec index c9b0ed8..af786d0 100644 --- a/SPECS/rust.spec +++ b/SPECS/rust.spec @@ -1,6 +1,6 @@ Name: rust Version: 1.79.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Rust Programming Language License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016) # ^ written as: (rust itself) and (bundled libraries) @@ -1139,6 +1139,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %changelog +* Fri Dec 06 2024 Josh Stone - 1.79.0-3 +- Remove the subshell in the cargo_install macro + * Tue Aug 13 2024 Josh Stone - 1.79.0-2 - Disable jump threading of float equality