From f42e4fddda051fb917b7576a69901db10ec9037917205642b08505f74b353a9b Mon Sep 17 00:00:00 2001
From: William Brown <william.brown@suse.com>
Date: Thu, 27 Jun 2024 23:52:10 +0000
Subject: [PATCH 1/2] - Add src, rustfmt and clippy for the Linux Kernel CI
 tooling.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust1.78?expand=0&rev=5
---
 rust1.78-rpmlintrc |  5 +++++
 rust1.78.changes   |  5 +++++
 rust1.78.spec      | 19 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/rust1.78-rpmlintrc b/rust1.78-rpmlintrc
index 3f82c89..ea48491 100644
--- a/rust1.78-rpmlintrc
+++ b/rust1.78-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.78.changes b/rust1.78.changes
index 7f4df8a..b02e817 100644
--- a/rust1.78.changes
+++ b/rust1.78.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 27 06:51:05 UTC 2024 - William Brown <william.brown@suse.com>
+
+- Add src, rustfmt and clippy for the Linux Kernel CI tooling.
+
 -------------------------------------------------------------------
 Fri May 17 22:53:49 UTC 2024 - William Brown <william.brown@suse.com>
 
diff --git a/rust1.78.spec b/rust1.78.spec
index 028c67a..d31872b 100644
--- a/rust1.78.spec
+++ b/rust1.78.spec
@@ -422,6 +422,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.
@@ -578,7 +588,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}} \
@@ -715,6 +725,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
@@ -765,4 +779,7 @@ python3 ./x.py test --target=%{rust_triple} \
 # End not with test
 %endif
 
+%files src
+%{rustlibdir}/src
+
 %changelog

From f90260eb97a3b8bcf3f7d1519618e7acd8c65d93d85631dbd896c1e23f8cbbf3 Mon Sep 17 00:00:00 2001
From: William Brown <william.brown@suse.com>
Date: Sat, 29 Jun 2024 03:12:22 +0000
Subject: [PATCH 2/2] - Fix incorrect test conditional

OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust1.78?expand=0&rev=6
---
 rust1.78.changes | 5 +++++
 rust1.78.spec    | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/rust1.78.changes b/rust1.78.changes
index b02e817..a90d17e 100644
--- a/rust1.78.changes
+++ b/rust1.78.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 28 06:38:06 UTC 2024 - William Brown <william.brown@suse.com>
+
+- Fix incorrect test conditional
+
 -------------------------------------------------------------------
 Thu Jun 27 06:51:05 UTC 2024 - William Brown <william.brown@suse.com>
 
diff --git a/rust1.78.spec b/rust1.78.spec
index d31872b..5611677 100644
--- a/rust1.78.spec
+++ b/rust1.78.spec
@@ -776,10 +776,11 @@ python3 ./x.py test --target=%{rust_triple} \
 %{_mandir}/man1/cargo*.1%{?ext_man}
 %dir %{_datadir}/cargo
 %dir %{_datadir}/cargo/registry
-# End not with test
-%endif
 
 %files src
 %{rustlibdir}/src
 
+# End not with test
+%endif
+
 %changelog