Skip to content

Commit 0017208

Browse files
committed
up to 1.78.0
docdir restructured after: rust-lang/rust@81c068a
1 parent 8a21aee commit 0017208

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

rust.spec

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
# To bootstrap from scratch, set the channel and date from src/stage0.json
2222
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
2323
# or nightly wants some beta-YYYY-MM-DD
24-
%define bootstrap_rust 1.76.0
24+
%define bootstrap_rust 1.77.0
2525
%define bootstrap_cargo %{bootstrap_rust}
26-
%define bootstrap_date 2024-02-08
26+
%define bootstrap_date 2024-03-21
2727

2828
%ifarch x32
2929
%define with_cross 1
@@ -36,23 +36,23 @@
3636
Summary: The Rust Programming Language
3737
Summary(pl.UTF-8): Język programowania Rust
3838
Name: rust
39-
Version: 1.77.0
39+
Version: 1.78.0
4040
Release: 1
4141
# Licenses: (rust itself) and (bundled libraries)
4242
License: (Apache v2.0 or MIT) and (BSD and ISC and MIT)
4343
Group: Development/Languages
4444
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
45-
# Source0-md5: 7df442945fb2e32cbccd45a7faa3a5e1
45+
# Source0-md5: ce1c084daec811aac07951cc954e7809
4646
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
47-
# Source1-md5: 5f9b4a89f2123e044cc46c7659dfc4fb
47+
# Source1-md5: f43ac158610b581a3eb1df90a0f2325c
4848
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
49-
# Source2-md5: fe76aea1be1894a9b48e1bea614038c6
49+
# Source2-md5: 9c6f2bdbd69660494db2f0dd6c1bc4bc
5050
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
51-
# Source3-md5: b4741f9574bd432e2370c91d56d17ae0
51+
# Source3-md5: 850f45e4f4b295612c5ffa754a9947d2
5252
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
53-
# Source4-md5: de71c41731df9187d4cca2f61359be28
53+
# Source4-md5: 4cdd14f0e197badb9cec70c2f2bc2f88
5454
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
55-
# Source5-md5: 80c933da93013752d852f6f1280d7e12
55+
# Source5-md5: e3d5e2e169cfeea09fc00685b7c88705
5656
URL: https://www.rust-lang.org/
5757
# for src/compiler-rt
5858
BuildRequires: cmake >= 3.4.3
@@ -459,12 +459,14 @@ find $RPM_BUILD_ROOT%{rustlibdir}/ -maxdepth 1 -type f -exec rm -v '{}' '+'
459459
# -- should we find a way to preserve debuginfo?
460460

461461
# Remove unwanted documentation files (we already package them)
462-
%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/README.md
463-
%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYRIGHT
464-
%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/LICENSE-APACHE
465-
%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/LICENSE-MIT
462+
%{__rm} $RPM_BUILD_ROOT%{_docdir}/rustc/README.md
463+
%{__rm} $RPM_BUILD_ROOT%{_docdir}/rustc/COPYRIGHT
464+
%{__rm} $RPM_BUILD_ROOT%{_docdir}/rustc/LICENSE-APACHE
465+
%{__rm} $RPM_BUILD_ROOT%{_docdir}/rustc/LICENSE-MIT
466466

467467
# Sanitize the HTML documentation
468+
install -d $RPM_BUILD_ROOT%{_docdir}/%{name}
469+
%{__mv} $RPM_BUILD_ROOT%{_docdir}/{docs,%{name}}/html
468470
find $RPM_BUILD_ROOT%{_docdir}/%{name}/html -empty -delete
469471
find $RPM_BUILD_ROOT%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
470472

0 commit comments

Comments
 (0)