Parcourir la source

rust-1.65.0-1

Tomohiro "Tomo-p" KATO il y a 2 ans
Parent
commit
dbe142e7f3
1 fichiers modifiés avec 10 ajouts et 30 suppressions
  1. 10 30
      r/rust/rust-vl.spec

+ 10 - 30
r/rust/rust-vl.spec

@@ -9,7 +9,7 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.64.0
+%global rustc_version 1.65.0
 %global cargo_version %{rustc_version}
 %global rustfmt_version %{rustc_version}
 %global rls_version %{rustc_version}
@@ -25,8 +25,8 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.txt
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_rust 1.63.0
-%global bootstrap_cargo 1.63.0
+%global bootstrap_rust 1.64.0
+%global bootstrap_cargo 1.64.0
 %global bootstrap_channel %{bootstrap_rust}
 
 # Only the specified arches will use bootstrap binaries.
@@ -183,6 +183,8 @@ Provides:       bundled(miniz) = 1.14
 Provides:       rustc = %{version}-%{release}
 Provides:       rustc%{?_isa} = %{version}-%{release}
 
+Obsoletes:      rust-rls < %{version}-%{release}
+
 %if ! %{with miri}
 Obsoletes:      rust-miri < %{version}-%{release}
 %endif
@@ -335,22 +337,6 @@ Obsoletes:      rustfmt-preview < 1.0.0
 A tool for formatting Rust code according to style guidelines.
 
 
-%package -n rls
-Summary:        Rust Language Server for IDE integration
-Version:        %{rls_version}
-Group:          programming
-Requires:       rust-analysis
-# /usr/bin/rls is dynamically linked against internal rustc libs
-Requires:       %{name} = %{rustc_version}-%{release}
-Obsoletes:      rls-preview < 1.0.0
-
-%description -n rls
-The Rust Language Server provides a server that runs in the background,
-providing IDEs, editors, and other tools with information about Rust programs.
-It supports functionality such as 'goto definition', symbol search,
-reformatting, and code completion, and enables renaming and refactorings.
-
-
 %package -n clippy
 Summary:        Lints to catch common mistakes and improve your Rust code
 Version:        %{clippy_version}
@@ -382,8 +368,7 @@ Requires:       rust-std-static = %{rustc_version}-%{release}
 
 %description analysis
 This package contains analysis data files produced with rustc's -Zsave-analysis
-feature for the Rust standard library. The RLS (Rust Language Server) uses this
-data to provide information about the Rust standard library.
+feature for the Rust standard library.
 
 
 %if %{with miri}
@@ -406,8 +391,6 @@ Requires:       rust = %{rustc_version}-%{release}
 
 %description analyzer
 rust-analyzer is a modular compiler frontend for the Rust language.
-It is a part of a larger rls-2.0 effort to create excellent IDE support
-for Rust.
 
 
 %if %{with newrpm}
@@ -552,7 +535,7 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
   %{enable_debuginfo} \
   --set rust.codegen-units-std=1 \
   --enable-extended \
-  --tools=analysis,cargo,clippy,rls,rustfmt,rust-analyzer,src \
+  --tools=analysis,cargo,clippy,rustfmt,rust-analyzer,src \
   --enable-vendor \
   --enable-verbose-tests \
   --release-channel=%{channel} \
@@ -670,7 +653,6 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %{__python3} ./x.py test --no-fail-fast || :
 %{__python3} ./x.py test --no-fail-fast cargo || :
 %{__python3} ./x.py test --no-fail-fast clippy || :
-%{__python3} ./x.py test --no-fail-fast rls || :
 %{__python3} ./x.py test --no-fail-fast rustfmt || :
 %endif
 
@@ -751,11 +733,6 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
 
-%files -n rls
-%{_bindir}/rls
-%doc src/tools/rls/{README.md,COPYRIGHT,debugging.md}
-%license src/tools/rls/LICENSE-{APACHE,MIT}
-
 %files -n clippy
 %{_bindir}/cargo-clippy
 %{_bindir}/clippy-driver
@@ -781,6 +758,9 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 
 
 %changelog
+* Fri Nov 04 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.65.0-1
+- new upstream release.
+
 * Fri Sep 23 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.64.0-1
 - new upstream release.