瀏覽代碼

rust-1.52.0-1

Tomohiro "Tomo-p" KATO 3 年之前
父節點
當前提交
598ea30f88
共有 1 個文件被更改,包括 9 次插入8 次删除
  1. 9 8
      r/rust/rust-vl.spec

+ 9 - 8
r/rust/rust-vl.spec

@@ -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.51.0
+%global rustc_version 1.52.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.50.0
-%global bootstrap_cargo 1.50.0
+%global bootstrap_rust 1.51.0
+%global bootstrap_cargo 1.51.0
 %global bootstrap_channel %{bootstrap_rust}
 
 # Only the specified arches will use bootstrap binaries.
@@ -56,7 +56,7 @@
 Summary:        The Rust Programming Language
 Name:           rust
 Version:        %{rustc_version}
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -73,10 +73,6 @@ ExclusiveArch:  %{rust_arches}
 %global rustc_package rustc-%{channel}-src
 %endif
 Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.gz
-# https://github.com/rust-lang/rust/commit/c7d9bffe76477a2f79c468b07e5eaf82525eea99
-Patch0:         rust-HWASan-support.patch
-# https://github.com/rust-lang/rust/commit/55f345f32505c2095966a5dc46c4ae3290dbf7a1
-Patch1:         rust-llvm12.patch
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -694,6 +690,7 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %{_docdir}/%{name}/html/*.png
 %{_docdir}/%{name}/html/*.svg
 %{_docdir}/%{name}/html/*.woff
+%{_docdir}/%{name}/html/*.woff2
 %license %{_docdir}/%{name}/html/*.txt
 %license %{_docdir}/%{name}/html/*.md
 
@@ -747,6 +744,10 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 
 
 %changelog
+* Mon May 10 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.52.0-1
+- new upstream release.
+- dropped Patch0 and 1: merged to upstream.
+
 * Sun Apr 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.51.0-2
 - rebuilt with llvm-12.