diff --git a/_service b/_service index b3decef..81eb829 100644 --- a/_service +++ b/_service @@ -1,9 +1,11 @@ - https://github.com/rust-lang/rustup.git + + https://github.com/Firstyear/rustup.git @PARENT_TAG@~git@TAG_OFFSET@.%h git - 1.24.3 + + 1.24.3-patch-symlink-no-self-update * (\d+\.\d+\.\d+) \1 diff --git a/rustup-1.24.3~git0.ce5817a9.tar.xz b/rustup-1.24.3~git0.ce5817a9.tar.xz deleted file mode 100644 index 22ead18..0000000 --- a/rustup-1.24.3~git0.ce5817a9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c006819e8efde90a001b19f8a22fae0245bb095952aaa9b612f541e5177d708 -size 561884 diff --git a/rustup-1.24.3~git1.0a74fef5.tar.xz b/rustup-1.24.3~git1.0a74fef5.tar.xz new file mode 100644 index 0000000..af039c5 --- /dev/null +++ b/rustup-1.24.3~git1.0a74fef5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e370cbb747ae6e1c0b7fe2940adc921823634814b71bac1ac385361e137cdf50 +size 561908 diff --git a/rustup.changes b/rustup.changes index 66a68df..85f99c6 100644 --- a/rustup.changes +++ b/rustup.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Nov 1 00:37:07 UTC 2021 - William Brown + +- Add ownership of directories that are considered unowned in leap15.3 + +------------------------------------------------------------------- +Mon Oct 11 04:25:24 UTC 2021 - william.brown@suse.com + +- Apply patch: + * Symlink rustup-init when in no self update mode +- Add requires on gcc so that system linker is present as a dependency + +------------------------------------------------------------------- +Sat Oct 9 15:42:41 UTC 2021 - Michał Rostecki + +- Add symlink to rustup-init. rustup and rustup-init are the same + binary, but that binary behaves diferently based on the name it's + executed by. + rustup-init takes care of the initial setup, which includes + setting PATH, modifying .bashrc etc. It's supposed to be called + only once. + rustup doesn't perform those steps and it only manages + toolchains. It can be used the entire time. +- Install bash and zsh completion. + ------------------------------------------------------------------- Thu Oct 7 04:59:11 UTC 2021 - William Brown diff --git a/rustup.spec b/rustup.spec index 5642fa6..109bd4d 100644 --- a/rustup.spec +++ b/rustup.spec @@ -16,30 +16,33 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define rust_version 1.56 %define obsolete_rust_versioned() \ -Obsoletes: %{1}1.55%{?2:-%{2}} \ -Provides: %{1}1.55%{?2:-%{2}} \ -Obsoletes: %{1}1.54%{?2:-%{2}} \ -Provides: %{1}1.54%{?2:-%{2}} \ -Obsoletes: %{1}1.53%{?2:-%{2}} \ -Provides: %{1}1.53%{?2:-%{2}} \ -Obsoletes: %{1}1.52%{?2:-%{2}} \ -Obsoletes: %{1}1.51%{?2:-%{2}} +Obsoletes: %{1}1.55%{?2:-%{2}} < %{rust_version} \ +Provides: %{1}1.55%{?2:-%{2}} = %{rust_version} \ +Obsoletes: %{1}1.54%{?2:-%{2}} < %{rust_version} \ +Provides: %{1}1.54%{?2:-%{2}} = %{rust_version} \ +Obsoletes: %{1}1.53%{?2:-%{2}} < %{rust_version} \ +Provides: %{1}1.53%{?2:-%{2}} = %{rust_version} \ +Obsoletes: %{1}1.52%{?2:-%{2}} < %{rust_version} \ +Obsoletes: %{1}1.51%{?2:-%{2}} < %{rust_version} Name: rustup -Version: 1.24.3~git0.ce5817a9 +Version: 1.24.3~git1.0a74fef5 Release: 0 Summary: A tool for managing user Rust toolchains -License: ( 0BSD OR MIT OR Apache-2.0 ) AND ( Apache-2.0 OR BSL-1.0 ) AND ( Apache-2.0 OR ISC OR MIT ) AND ( Apache-2.0 OR MIT ) AND ( MIT OR Apache-2.0 OR Zlib ) AND ( MIT OR Zlib OR Apache-2.0 ) AND ( Unlicense OR MIT ) AND ( Zlib OR Apache-2.0 OR MIT ) AND Apache-2.0 AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT +License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT Group: Development/Languages/Rust -Url: https://github.com/rust-lang/rustup +URL: https://github.com/rust-lang/rustup Source0: %{name}-%{version}.tar.xz Source1: vendor.tar.xz Source2: cargo_config Source3: %{name}-rpmlintrc BuildRequires: cargo-packaging BuildRequires: pkgconfig(openssl) +# For system linker +Requires: gcc ExclusiveArch: %{rust_tier1_arches} %obsolete_rust_versioned rls @@ -49,13 +52,13 @@ ExclusiveArch: %{rust_tier1_arches} %obsolete_rust_versioned cargo doc Obsoletes: cargo-doc < %{rust_version} -Obsoletes: rustfmt < %{rust_version} Obsoletes: cargo-fmt < %{rust_version} Obsoletes: clippy < %{rust_version} -Obsoletes: rust-analysis < %{rust_version} Obsoletes: rls < %{rust_version} -Obsoletes: rust-src < %{rust_version} +Obsoletes: rust-analysis < %{rust_version} Obsoletes: rust-doc < %{rust_version} +Obsoletes: rust-src < %{rust_version} +Obsoletes: rustfmt < %{rust_version} %description A tool to manager user Rust toolchains. This is generally used by developers @@ -75,9 +78,31 @@ find vendor -type f -name \*.rs -exec chmod -x '{}' \; # manual process install -D -d -m 0755 %{buildroot}%{_bindir} install -m 0755 %{_builddir}/%{name}-%{version}/target/release/rustup-init %{buildroot}%{_bindir}/rustup +# rustup-init and rustup are the same binary, but that binary behaves +# differently based on the name it's executed by. +# rustup-init takes care of the initial setup, which includes setting PATH, +# modifying .bashrc etc. It's supposed to be called only once. +# rustup doesn't perform those steps and it only manages toolchains. It +# can be used the entire time. +ln -sf rustup %{buildroot}%{_bindir}/rustup-init +# shell completions +install -D -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions +ls %{buildroot}%{_bindir} +ls %{buildroot}%{_bindir}/rustup +%{buildroot}%{_bindir}/rustup completions bash > %{buildroot}%{_datadir}/bash-completion/completions/rustup +%{buildroot}%{_bindir}/rustup completions bash cargo > %{buildroot}%{_datadir}/bash-completion/completions/cargo +install -D -d -m 0755 %{buildroot}%{_datadir}/zsh/site-functions +%{buildroot}%{_bindir}/rustup completions zsh > %{buildroot}%{_datadir}/zsh/site-functions/_rustup +%{buildroot}%{_bindir}/rustup completions zsh cargo > %{buildroot}%{_datadir}/zsh/site-functions/_cargo %files %{_bindir}/rustup +%{_bindir}/rustup-init +%{_datadir}/bash-completion/completions/cargo +%{_datadir}/bash-completion/completions/rustup +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_cargo +%{_datadir}/zsh/site-functions/_rustup %changelog - diff --git a/vendor.tar.xz b/vendor.tar.xz index 4c1b066..302fa0c 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c47e3d5b404de969ec5fe883850adb79de35befb9ef6a74f1dbcff341327bd84 -size 26323964 +oid sha256:97fdb2af7ff33f1ab8a558cf6c6c349f99695edf35a119b74d63194b62322429 +size 26333848