# To bootstrap from scratch, set the channel and date from src/stage0.json
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
# or nightly wants some beta-YYYY-MM-DD
-%define bootstrap_rust 1.68.2
+%define bootstrap_rust 1.74.0
%define bootstrap_cargo %{bootstrap_rust}
-%define bootstrap_date 2023-03-28
+%define bootstrap_date 2023-11-16
%ifarch x32
%define with_cross 1
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.69.0
-Release: 3
+Version: 1.75.0
+Release: 1
# Licenses: (rust itself) and (bundled libraries)
License: (Apache v2.0 or MIT) and (BSD and ISC and MIT)
Group: Development/Languages
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
-# Source0-md5: 2fac6c46422e743f5f05287e89e72f22
+# Source0-md5: 62d794105a8c98923a67e6d9ce032be0
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: b82ae74e630a849d6675b93ddf0ed6ca
+# Source1-md5: d608ce47f4099374ec456a667a87ef38
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: a2affbb1e831228c71f972a270717ce3
+# Source2-md5: 14920e66eb12cb24022d5ac3f044c286
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 489073dd8a8380c28a570bf70c9fbd6e
+# Source3-md5: 9a02e2cb332d53886587be184128c206
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: bb43d3fca2893f2de0b892e0f4a8fdb3
+# Source4-md5: f503139222ec0711cde94fe905133419
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
-# Source5-md5: 5691b194302d66b40c3e4eee0eeb1813
-Patch0: llvm-tools-install.patch
-Patch1: 111167.patch
+# Source5-md5: 3a45f0ddab316ea7d41ac48e0f233d9d
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
BuildRequires: rpmbuild(macros) >= 1.752
%if %{without cross}
BuildRequires: curl-devel
-BuildRequires: libgit2-devel >= 1.4.0
+BuildRequires: libgit2-devel >= 1.7.1
BuildRequires: libstdc++-devel
%if %{with system_llvm}
-BuildRequires: llvm >= 14.0
-BuildRequires: llvm-devel >= 14.0
+BuildRequires: llvm >= 15.0
+BuildRequires: llvm-devel >= 15.0
%endif
BuildRequires: openssl-devel >= 1.0.1
BuildRequires: tar >= 1:1.22
# building on x86_64 host with --target x32-pld-linux
BuildRequires: curl-devel
BuildRequires: gcc-multilib-x32
-BuildRequires: libgit2-devel >= 1.4.0
+BuildRequires: libgit2-devel >= 1.7.1
BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel >= 14.0}
+%{?with_system_llvm:BuildRequires: llvm-devel >= 15.0}
BuildRequires: openssl-devel >= 1.0.1
BuildRequires: xz-devel
BuildRequires: zlib-devel
BuildRequires: curl-devel(x86-64)
BuildRequires: curl-devel(x86-x32)
BuildRequires: gcc-multilib-64
-BuildRequires: libgit2-devel(x86-64) >= 1.4.0
-BuildRequires: libgit2-devel(x86-x32) >= 1.4.0
+BuildRequires: libgit2-devel(x86-64) >= 1.7.1
+BuildRequires: libgit2-devel(x86-x32) >= 1.7.1
BuildRequires: libstdc++-multilib-64-devel
%if %{with system_llvm}
-BuildRequires: llvm-devel(x86-64) >= 14.0
-BuildRequires: llvm-devel(x86-x32) >= 14.0
+BuildRequires: llvm-devel(x86-64) >= 15.0
+BuildRequires: llvm-devel(x86-x32) >= 15.0
%endif
BuildRequires: openssl-devel(x86-64)
BuildRequires: openssl-devel(x86-x32)
%prep
%setup -q -n %{rustc_package}
-%patch0 -p1
-%patch1 -p1
%if %{with bootstrap}
%ifarch %{x8664} x32
%if "%{_libexecdir}" != "%{_prefix}/libexec"
suffix="%(echo "%{_libexecdir}" | %{__sed} -e 's,^%{_prefix}/,,')"
%{__sed} -i -e 's,"libexec","'${suffix}'",' \
- src/bootstrap/dist.rs \
- src/tools/cargo/src/cargo/ops/registry/auth.rs
-%{__sed} -i -e 's,libexec/,'${suffix}'/,' src/tools/cargo/tests/testsuite/credential_process.rs
+ src/bootstrap/dist.rs
%endif
# The configure macro will modify some autoconf-related files, which upsets
%attr(755,root,root) %{_bindir}/cargo-clippy
%attr(755,root,root) %{_bindir}/cargo-fmt
%attr(755,root,root) %{_bindir}/clippy-driver
-%attr(755,root,root) %{_libexecdir}/cargo-credential-1password
%{_mandir}/man1/cargo*.1*
%dir %{_datadir}/cargo
%dir %{_datadir}/cargo/registry