diff --git a/rust.spec b/rust.spec index c78c9459824f5515039daddb21006e63cfb98df8..45f62a42d3659850f03210a8a320b2281556e325 100644 --- a/rust.spec +++ b/rust.spec @@ -13,7 +13,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 @@ -27,7 +26,7 @@ Name: rust Version: 1.89.0 -Release: 1 +Release: 2 Summary: The Rust Programming Language License: Apache-2.0 OR MIT URL: https://www.rust-lang.org @@ -233,7 +232,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 @@ -247,7 +245,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 @@ -384,7 +381,7 @@ test -r "%{profiler}" --disable-rpath \ %{enable_debuginfo} \ --enable-extended \ - --tools=cargo,clippy,%{?with_analyzer:rust-analyzer,}rustfmt,src \ + --tools=cargo,clippy,rust-analyzer,rustfmt,src \ --enable-vendor \ --enable-verbose-tests \ %{?codegen_units_std} \ @@ -459,9 +456,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 @@ -477,9 +472,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} @@ -537,12 +530,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}/rust-analyzer %doc src/tools/rust-analyzer/README.md %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT} -%endif %files -n clippy %{_bindir}/cargo-clippy @@ -566,6 +557,10 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Wed Sep 24 2025 wangkai <13474090681@163.com> - 1.89.0-2 +- Remove rls command +- Cleanup spec + * Sun Aug 10 2025 Funda Wang - 1.89.0-1 - update to 1.89.0