noarch zsh-completion-cargo

[packages/rust.git] / rust.spec

diff --git a/rust.spec b/rust.spec
index 2142572b7c24e97c3a6ad6b9510b84d4360d8c32..28e303992b72cca30a03725af926a50f31bb2a7f 100644 (file)
--- a/rust.spec
+++ b/rust.spec
@@ -21,9 +21,9 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.json
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%define                bootstrap_rust  1.63.0
+%define                bootstrap_rust  1.67.1
 %define                bootstrap_cargo %{bootstrap_rust}
-%define                bootstrap_date  2022-08-11
+%define                bootstrap_date  2023-02-09
 
 %ifarch x32
 %define                with_cross      1
@@ -36,27 +36,31 @@
 Summary:       The Rust Programming Language
 Summary(pl.UTF-8):     Język programowania Rust
 Name:          rust
-Version:       1.64.0
-Release:       3
+Version:       1.68.0
+Release:       1
 # Licenses: (rust itself) and (bundled libraries)
 License:       (Apache v2.0 or MIT) and (BSD and ISC and MIT)
 Group:         Development/Languages
 Source0:       https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
-# Source0-md5: e77ac3a786d013604061b17f99dd9b27
+# Source0-md5: e0c4908ceb01945930da218d172a21ba
 Source1:       https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: fccd4c3722193f8753d2918260f8c770
+# Source1-md5: 800e693e0ac317755f8f0e19269540db
 Source2:       https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: 6802c415076b992b3122073e258aba80
+# Source2-md5: 65d86e2c17b1a09df55860a1d8dec9d4
 Source3:       https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: a38786367b5950df6e0da112df405aef
+# Source3-md5: 127fdf3e824e23808a1fa6a8e92bcf56
 Source4:       https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: 6bcdb6c0c6378ada390180dbc0530995
+# Source4-md5: 70acb1412ca21e288105d86a7d5b975b
 Source5:       https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
-# Source5-md5: 4877c64e55ae70eb4d0f93b262b37a1e
+# Source5-md5: 1d917abdc484fd34c1471a931349a2c5
+Patch0:                llvm-tools-install.patch
 URL:           https://www.rust-lang.org/
 # for src/compiler-rt
 BuildRequires: cmake >= 3.4.3
 BuildRequires: curl
+%ifarch %{arm} %{mips32} %{ppc}
+BuildRequires: libatomic-devel
+%endif
 # make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
 BuildRequires: procps
 BuildRequires: python3
@@ -68,8 +72,8 @@ BuildRequires:        curl-devel
 BuildRequires: libgit2-devel >= 1.4.0
 BuildRequires: libstdc++-devel
 %if %{with system_llvm}
-BuildRequires: llvm >= 12.0
-BuildRequires: llvm-devel >= 12.0
+BuildRequires: llvm >= 13.0
+BuildRequires: llvm-devel >= 13.0
 %endif
 BuildRequires: openssl-devel >= 1.0.1
 BuildRequires: tar >= 1:1.22
@@ -91,7 +95,7 @@ BuildRequires:        curl-devel
 BuildRequires: gcc-multilib-x32
 BuildRequires: libgit2-devel >= 1.4.0
 BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires:     llvm-devel >= 12.0}
+%{?with_system_llvm:BuildRequires:     llvm-devel >= 13.0}
 BuildRequires: openssl-devel >= 1.0.1
 BuildRequires: xz-devel
 BuildRequires: zlib-devel
@@ -104,8 +108,8 @@ BuildRequires:      libgit2-devel(x86-64) >= 1.4.0
 BuildRequires: libgit2-devel(x86-x32) >= 1.4.0
 BuildRequires: libstdc++-multilib-64-devel
 %if %{with system_llvm}
-BuildRequires: llvm-devel(x86-64) >= 12.0
-BuildRequires: llvm-devel(x86-x32) >= 12.0
+BuildRequires: llvm-devel(x86-64) >= 13.0
+BuildRequires: llvm-devel(x86-x32) >= 13.0
 %endif
 BuildRequires: openssl-devel(x86-64)
 BuildRequires: openssl-devel(x86-x32)
@@ -224,10 +228,11 @@ Standard library for Rust.
 Standardowa biblioteka Rusta.
 
 %package analyzer
-Summary:    Implementation of Language Server Protocol for Rust
-Summary(pl.UTF-8):    Implementacja Language Server Protocol dla Rusta
-Group:        Development/Tools
-Requires:    %{name} = %{version}-%{release}
+Summary:       Implementation of Language Server Protocol for Rust
+Summary(pl.UTF-8):     Implementacja Language Server Protocol dla Rusta
+Group:         Development/Tools
+Requires:      %{name} = %{version}-%{release}
+Obsoletes:     rust-rls < 1.65.0
 
 %description analyzer
 Implementation of Language Server Protocol for Rust.
@@ -280,19 +285,6 @@ debugging of Rust programs.
 Ten pakiet zawiera skrypt rust-lldb, pozwalający na łatwiejsze
 odpluskwianie programów w języku Rust.
 
-%package rls
-Summary:       Rust Language Server for IDE integration
-Summary(pl.UTF-8):     Rust Language Server do integracji z IDE
-Group:         Development/Tools
-Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-analysis = %{version}-%{release}
-
-%description rls
-Rust Language Server for IDE integration.
-
-%description rls -l pl.UTF-8
-Rust Language Server do integracji z IDE.
-
 %package doc
 Summary:       Documentation for Rust
 Summary(pl.UTF-8):     Dokumentacja do Rusta
@@ -327,6 +319,7 @@ Summary(pl.UTF-8):  Bashowe dopełnianie parametrów polecenia cargo
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 Requires:      bash-completion
+BuildArch:     noarch
 
 %description -n bash-completion-cargo
 Bash completion for cargo command.
@@ -340,6 +333,7 @@ Summary(pl.UTF-8):  Dopełnianie parametrów polecenia cargo w powłoce Zsh
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
 Requires:      zsh
+BuildArch:     noarch
 
 %description -n zsh-completion-cargo
 Zsh completion for cargo command.
@@ -349,6 +343,7 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh.
 
 %prep
 %setup -q -n %{rustc_package}
+%patch0 -p1 -R
 
 %if %{with bootstrap}
 %ifarch %{x8664} x32
@@ -556,10 +551,6 @@ done
 %attr(755,root,root) %{_bindir}/rust-gdbgui
 %{_datadir}/%{name}/etc/gdb_*.py*
 
-%files rls
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rls
-
 %files doc
 %defattr(644,root,root,755)
 %dir %{_docdir}/%{name}