From 45c53aa3b6e5dbac038505d85f8216b5e56a47862319d04fd92b49b4859ff330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 23 Aug 2024 17:02:23 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main rust1.79 revision
 6cd9c110683301f83fc0d587c0b62924

---
 rust1.79-rpmlintrc |  5 +++++
 rust1.79.changes   | 10 ++++++++++
 rust1.79.spec      | 20 +++++++++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/rust1.79-rpmlintrc b/rust1.79-rpmlintrc
index 3f82c89..ea48491 100644
--- a/rust1.79-rpmlintrc
+++ b/rust1.79-rpmlintrc
@@ -28,3 +28,8 @@ addFilter("readelf-failed /usr/lib/rustlib/wasm32-wasi/lib/self-contained/libc.a
 
 # We know, it's okay.
 addFilter("obsolete-not-provided .*")
+
+# We need to provide the rust sources, they aren't a devel package.
+addFilter("devel-file-in-non-devel-package .*")
+# Some of the sources have test scripts, ignore.
+addFilter("env-script-interpreter .*")
diff --git a/rust1.79.changes b/rust1.79.changes
index 71ebe60..f272fed 100644
--- a/rust1.79.changes
+++ b/rust1.79.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jun 28 06:37:16 UTC 2024 - William Brown <william.brown@suse.com>
+
+- Fix incorrect test conditional
+
+-------------------------------------------------------------------
+Thu Jun 27 06:46:51 UTC 2024 - William Brown <william.brown@suse.com>
+
+- Add src, rustfmt and clippy for the Linux Kernel CI tooling.
+
 -------------------------------------------------------------------
 Fri Jun 14 06:45:06 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
 
diff --git a/rust1.79.spec b/rust1.79.spec
index 4cb1f20..4626655 100644
--- a/rust1.79.spec
+++ b/rust1.79.spec
@@ -423,6 +423,16 @@ Provides:       rust+cargo = %{version}
 %description -n cargo%{version_suffix}
 Cargo downloads dependencies of Rust projects and compiles it.
 
+%package src
+Summary:        The Rust Standard Library Source
+License:        Apache-2.0 OR MIT
+Group:          Development/Languages/Rust
+Requires:       rust-std = %{version}
+BuildArch:      noarch
+
+%description src
+Rust Stanard Library Sources are required for building some types of projects
+
 %prep
 # Previously the stage0 compiler was skipped in test builds, but there are now
 # tests in rust's source tree that require it.
@@ -579,7 +589,7 @@ PATH_TO_LLVM_PROFILER=`echo %{_libdir}/clang/??/lib/linux/libclang_rt.profile-*.
   %{debug_info} \
   --enable-vendor \
   --enable-extended \
-  --tools="cargo,rustdoc" \
+  --tools="cargo,clippy,rustdoc,rustfmt,src" \
   --release-channel="stable" \
   --set rust.deny-warnings=false \
   %{!?with_bundled_llvm: --set target.%{rust_triple}.profiler=${PATH_TO_LLVM_PROFILER}} \
@@ -716,6 +726,10 @@ python3 ./x.py test --target=%{rust_triple} \
 %{_bindir}/rust-gdb
 %{_bindir}/rust-gdbgui
 %{_bindir}/rust-lldb
+%{_bindir}/cargo-clippy
+%{_bindir}/cargo-fmt
+%{_bindir}/clippy-driver
+%{_bindir}/rustfmt
 %{_mandir}/man1/rustc.1%{?ext_man}
 %{_mandir}/man1/rustdoc.1%{?ext_man}
 %{_prefix}/lib/lib*.so
@@ -763,6 +777,10 @@ python3 ./x.py test --target=%{rust_triple} \
 %{_mandir}/man1/cargo*.1%{?ext_man}
 %dir %{_datadir}/cargo
 %dir %{_datadir}/cargo/registry
+
+%files src
+%{rustlibdir}/src
+
 # End not with test
 %endif