From 1ab7fa3e9d8412a538498646ebfd73aedff4f56ed4bba350b9103f4991240d6a Mon Sep 17 00:00:00 2001 From: William Brown Date: Sun, 10 Oct 2021 22:55:18 +0000 Subject: [PATCH 1/4] Accepting request 924402 from home:mrostecki:branches:devel:languages:rust - 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. OBS-URL: https://build.opensuse.org/request/show/924402 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rustup?expand=0&rev=5 --- rustup.changes | 13 +++++++++++++ rustup.spec | 21 +++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/rustup.changes b/rustup.changes index 66a68df..c47cf8f 100644 --- a/rustup.changes +++ b/rustup.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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..654e7bb 100644 --- a/rustup.spec +++ b/rustup.spec @@ -75,9 +75,30 @@ 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 +%{_datadir}/zsh/site-functions/_cargo +%{_datadir}/zsh/site-functions/_rustup %changelog From 169529930e8609a3f6163ff7a174493566b476e7099f3d08ef81b8c671308774 Mon Sep 17 00:00:00 2001 From: William Brown Date: Mon, 11 Oct 2021 05:04:57 +0000 Subject: [PATCH 2/4] Accepting request 924577 from home:firstyear:branches:devel:languages:rust - Apply patch: * Symlink rustup-init when in no self update mode OBS-URL: https://build.opensuse.org/request/show/924577 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rustup?expand=0&rev=6 --- _service | 6 ++++-- rustup-1.24.3~git0.ce5817a9.tar.xz | 3 --- rustup-1.24.3~git1.0a74fef5.tar.xz | 3 +++ rustup.changes | 6 ++++++ rustup.spec | 18 +++++++++--------- vendor.tar.xz | 4 ++-- 6 files changed, 24 insertions(+), 16 deletions(-) delete mode 100644 rustup-1.24.3~git0.ce5817a9.tar.xz create mode 100644 rustup-1.24.3~git1.0a74fef5.tar.xz 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 c47cf8f..824c573 100644 --- a/rustup.changes +++ b/rustup.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 11 04:25:24 UTC 2021 - william.brown@suse.com + +- Apply patch: + * Symlink rustup-init when in no self update mode + ------------------------------------------------------------------- Sat Oct 9 15:42:41 UTC 2021 - Michał Rostecki diff --git a/rustup.spec b/rustup.spec index 654e7bb..b942d24 100644 --- a/rustup.spec +++ b/rustup.spec @@ -18,17 +18,17 @@ %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 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 From 57c66c4fabd820c4f0d8bb6cf1481db105d216f973ebfab1e925f625088f0a0a Mon Sep 17 00:00:00 2001 From: William Brown Date: Mon, 11 Oct 2021 05:37:39 +0000 Subject: [PATCH 3/4] Accepting request 924580 from home:firstyear:branches:devel:languages:rust - Add requires on gcc so that system linker is present as a dependency OBS-URL: https://build.opensuse.org/request/show/924580 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rustup?expand=0&rev=7 --- rustup.changes | 1 + rustup.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/rustup.changes b/rustup.changes index 824c573..1c3a2e8 100644 --- a/rustup.changes +++ b/rustup.changes @@ -3,6 +3,7 @@ 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 diff --git a/rustup.spec b/rustup.spec index b942d24..ff6e003 100644 --- a/rustup.spec +++ b/rustup.spec @@ -40,6 +40,8 @@ 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 From 1accf1bae0da503dcc04639881f68d422284504fd7566466ff734a46bece3c31 Mon Sep 17 00:00:00 2001 From: William Brown Date: Mon, 1 Nov 2021 00:39:32 +0000 Subject: [PATCH 4/4] Accepting request 928440 from home:firstyear:branches:devel:languages:rust - Add ownership of directories that are considered unowned in leap15.3 OBS-URL: https://build.opensuse.org/request/show/928440 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rustup?expand=0&rev=9 --- rustup.changes | 5 +++++ rustup.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/rustup.changes b/rustup.changes index 1c3a2e8..85f99c6 100644 --- a/rustup.changes +++ b/rustup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/rustup.spec b/rustup.spec index ff6e003..109bd4d 100644 --- a/rustup.spec +++ b/rustup.spec @@ -16,6 +16,7 @@ # 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}} < %{rust_version} \ @@ -31,9 +32,9 @@ Name: rustup 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 @@ -51,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 @@ -99,8 +100,9 @@ install -D -d -m 0755 %{buildroot}%{_datadir}/zsh/site-functions %{_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 -