|
|
@@ -8,7 +8,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.49.0
|
|
|
+%global rustc_version 1.50.0
|
|
|
%global cargo_version %{rustc_version}
|
|
|
%global rustfmt_version %{rustc_version}
|
|
|
%global rls_version %{rustc_version}
|
|
|
@@ -24,8 +24,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.46.0
|
|
|
-%global bootstrap_cargo 1.46.0
|
|
|
+%global bootstrap_rust 1.49.0
|
|
|
+%global bootstrap_cargo 1.49.0
|
|
|
%global bootstrap_channel %{bootstrap_rust}
|
|
|
|
|
|
# Only the specified arches will use bootstrap binaries.
|
|
|
@@ -206,6 +206,14 @@ Requires: /usr/bin/cc
|
|
|
%global _find_debuginfo_opts --keep-section .rustc
|
|
|
%endif
|
|
|
|
|
|
+%if !%{with newrpm}
|
|
|
+Obsoletes: rust-debuginfo < %{version}-%{release}
|
|
|
+%else
|
|
|
+%ifnarch x86_64
|
|
|
+Obsoletes: rust-debuginfo < %{version}-%{release}
|
|
|
+%endif
|
|
|
+%endif
|
|
|
+
|
|
|
# Use hardening ldflags.
|
|
|
%global rustflags -Clink-arg=-Wl,-z,relro,-z,now
|
|
|
|
|
|
@@ -383,7 +391,12 @@ An experimental interpreter for Rust's mid-level intermediate representation
|
|
|
classes of undefined behavior.
|
|
|
|
|
|
|
|
|
+%if %{with newrpm}
|
|
|
+# debuginfo is available on x86_64 only
|
|
|
+%ifarch x86_64
|
|
|
%debug_package
|
|
|
+%endif
|
|
|
+%endif
|
|
|
|
|
|
|
|
|
%prep
|
|
|
@@ -603,6 +616,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_commands
|
|
|
rm -rf %{buildroot}/home
|
|
|
%endif
|
|
|
|
|
|
+# We don't want Rust copies of LLVM tools (rust-lld, rust-llvm-dwp)
|
|
|
+rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
|
|
|
+
|
|
|
|
|
|
%check
|
|
|
%if %{with test}
|
|
|
@@ -684,6 +700,7 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
|
|
|
%license src/tools/cargo/LICENSE-APACHE src/tools/cargo/LICENSE-MIT src/tools/cargo/LICENSE-THIRD-PARTY
|
|
|
%doc src/tools/cargo/README.md
|
|
|
%{_bindir}/cargo
|
|
|
+%{_libexecdir}/cargo*
|
|
|
%{_mandir}/man1/cargo*.1*
|
|
|
%dir %{_sysconfdir}/bash_completion.d
|
|
|
%{_sysconfdir}/bash_completion.d/cargo
|
|
|
@@ -729,6 +746,9 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Feb 21 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.50.0-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Wed Jan 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.49.0-1
|
|
|
- new upstream release.
|
|
|
|
tomop