From 3109817190ba989459c69590afdd45dd6beafffb Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Wed, 24 Sep 2025 21:43:51 +0800
Subject: [PATCH] Remove rls command

---
 rust.spec | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/rust.spec b/rust.spec
index 634dae3..7741208 100644
--- a/rust.spec
+++ b/rust.spec
@@ -12,7 +12,6 @@
 %bcond_without bundled_libgit2
 %bcond_with disabled_libssh2
 %bcond_without lldb
-%bcond_without analyzer
 # disable rust-lld (enabled by default on x86 since 1.80.0 via pull/124129) for
 # building with system llvm (17.0.6)
 # https://github.com/rust-lang/rust/issues/131291
@@ -26,7 +25,7 @@
 
 Name:                rust
 Version:             1.86.0
-Release:             5
+Release:             6
 Summary:             The Rust Programming Language
 License:             Apache-2.0 OR MIT
 URL:                 https://www.rust-lang.org
@@ -228,7 +227,6 @@ Conflicts:           rustfmt-preview < 1.0.0
 %description -n rustfmt
 A tool for formatting Rust code according to style guidelines.
 
-%if %{with analyzer}
 %package analyzer
 Summary:Rust implementation of the Language Server Protocol
 Requires:            %{name}-src
@@ -242,7 +240,6 @@ Requires:           %{name} = %{version}-%{release}
 rust-analyzer is an implementation of Language Server Protocol for the Rust
 programming language. It provides features like completion and goto definition
 for many code editors, including VS Code, Emacs and Vim.
-%endif
 
 %package -n clippy
 Summary:             Lints to catch common mistakes and improve your Rust code
@@ -381,7 +378,7 @@ test -r "%{profiler}"
   --disable-rpath \
   %{enable_debuginfo} \
   --enable-extended \
-  --tools=cargo,clippy,%{?with_analyzer:rls,rust-analyzer,}rustfmt,src \
+  --tools=cargo,clippy,rust-analyzer,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
   %{?codegen_units_std} \
@@ -437,11 +434,6 @@ install -m 0644 -D -p %{SOURCE3} %{buildroot}%{_sysconfdir}/skel/.cargo/config.t
 install -m 0644 -D -p %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.sh
 install -m 0644 -D -p %{SOURCE5} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.csh
 
-%if %{with analyzer}
-# The rls stub doesn't have an install target, but we can just copy it.
-%{__install} -t %{buildroot}%{_bindir} build/%{rust_triple}/stage2-tools-bin/rls
-%endif
-
 %if %without lldb
 rm -f %{buildroot}%{_bindir}/rust-lldb
 rm -f %{buildroot}%{rustlibdir}/etc/lldb_*
@@ -457,9 +449,7 @@ export %{rust_env}
 %endif
 %{python} ./x.py test --no-fail-fast --stage 2 cargo %{?cargo_test_skip} || :
 %{python} ./x.py test --no-fail-fast --stage 2 clippy || :
-%if %{with analyzer}
 %{python} ./x.py test --no-fail-fast --stage 2 rust-analyzer || :
-%endif
 %{python} ./x.py test --no-fail-fast --stage 2 rustfmt || :
 %ldconfig_scriptlets
 
@@ -475,9 +465,7 @@ export %{rust_env}
 %dir %{rustlibdir}
 %dir %{rustlibdir}/%{rust_triple}
 %dir %{rustlibdir}/%{rust_triple}/lib
-%if %{with analyzer}
 %{_libexecdir}/rust-analyzer-proc-macro-srv
-%endif
 %{rustlibdir}/%{rust_triple}/lib/*.so
 %if %{with musl_target}
 %dir %{rustlibdir}/%{rust_musl_triple}
@@ -533,13 +521,10 @@ export %{rust_env}
 %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
 
-%if %{with analyzer}
 %files analyzer
-%{_bindir}/rls
 %{_bindir}/rust-analyzer
 %doc src/tools/rust-analyzer/README.md
 %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT}
-%endif
 
 %files -n clippy
 %{_bindir}/cargo-clippy
@@ -563,6 +548,10 @@ export %{rust_env}
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Wed Sep 24 2025 wangkai <13474090681@163.com> - 1.86.0-6
+- Remove rls command
+- Cleanup spec
+
 * Wed Jun 11 2025 Peng Haitao <htpengc@isoftstone.com> - 1.86.0-5
 - Modify openEuler to %{vendor}
 
-- 
Gitee