Accepting request 954134 from home:firstyear:branches:devel:languages:rust

- Remove patch for symlinking to rustup-init in no self update
- Provide proxy binaries for users that link to rustup, preventing
  a need for rustup-init

OBS-URL: https://build.opensuse.org/request/show/954134
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rustup?expand=0&rev=11

_service

@@ -1,11 +1,11 @@
 <services>
   <service mode="disabled" name="obs_scm">
-    <!-- <param name="url">https://github.com/rust-lang/rustup.git</param> -->
-    <param name="url">https://github.com/Firstyear/rustup.git</param>
-    <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
+    <param name="url">https://github.com/rust-lang/rustup.git</param>
+    <!-- <param name="url">https://github.com/Firstyear/rustup.git</param> -->
+    <param name="versionformat">@PARENT_TAG@~@TAG_OFFSET@</param>
     <param name="scm">git</param>
-    <!-- <param name="revision">1.24.3</param> -->
-    <param name="revision">1.24.3-patch-symlink-no-self-update</param>
+    <param name="revision">1.24.3</param>
+    <!-- <param name="revision">1.24.3-patch-symlink-no-self-update</param> -->
     <param name="match-tag">*</param>
     <param name="versionrewrite-pattern">(\d+\.\d+\.\d+)</param>
     <param name="versionrewrite-replacement">\1</param>

rustup-1.24.3~0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c0283d3ac36e7ea219553730eb5b80a4e8bd9b600b6fc174eb15a843f4e0252
+size 561908

rustup-1.24.3~git1.0a74fef5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e370cbb747ae6e1c0b7fe2940adc921823634814b71bac1ac385361e137cdf50
-size 561908

rustup.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 14 00:44:44 UTC 2022 - william.brown@suse.com
+
+- Remove patch for symlinking to rustup-init in no self update
+- Provide proxy binaries for users that link to rustup, preventing
+  a need for rustup-init
+
 -------------------------------------------------------------------
 Thu Jan 06 07:02:42 UTC 2022 - william.brown@suse.com
 

rustup.spec

@@ -29,7 +29,7 @@ Obsoletes:      %{1}1.52%{?2:-%{2}} < %{rust_version} \
 Obsoletes:      %{1}1.51%{?2:-%{2}} < %{rust_version}
 
 Name:           rustup
-Version:        1.24.3~git1.0a74fef5
+Version:        1.24.3~0
 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 (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
@@ -84,11 +84,25 @@ install -m 0755 %{_builddir}/%{name}-%{version}/target/release/rustup-init %{bui
 # 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
+# ln -sf rustup %{buildroot}%{_bindir}/rustup-init
+ln -sf rustup %{buildroot}%{_bindir}/rustc
+ln -sf rustup %{buildroot}%{_bindir}/rustdoc
+ln -sf rustup %{buildroot}%{_bindir}/cargo
+ln -sf rustup %{buildroot}%{_bindir}/rust-lldb
+ln -sf rustup %{buildroot}%{_bindir}/rust-gdb
+ln -sf rustup %{buildroot}%{_bindir}/rust-gdbgui
+ln -sf rustup %{buildroot}%{_bindir}/rls
+ln -sf rustup %{buildroot}%{_bindir}/cargo-clippy
+ln -sf rustup %{buildroot}%{_bindir}/clippy-driver
+ln -sf rustup %{buildroot}%{_bindir}/cargo-miri
+ln -sf rustup %{buildroot}%{_bindir}/rustfmt
+ln -sf rustup %{buildroot}%{_bindir}/cargo-fmt
+
 # 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
@@ -97,7 +111,19 @@ install -D -d -m 0755 %{buildroot}%{_datadir}/zsh/site-functions
 
 %files
 %{_bindir}/rustup
-%{_bindir}/rustup-init
+# %{_bindir}/rustup-init
+%{_bindir}/rustc
+%{_bindir}/rustdoc
+%{_bindir}/cargo
+%{_bindir}/rust-lldb
+%{_bindir}/rust-gdb
+%{_bindir}/rust-gdbgui
+%{_bindir}/rls
+%{_bindir}/cargo-clippy
+%{_bindir}/clippy-driver
+%{_bindir}/cargo-miri
+%{_bindir}/rustfmt
+%{_bindir}/cargo-fmt
 %{_datadir}/bash-completion/completions/cargo
 %{_datadir}/bash-completion/completions/rustup
 %dir %{_datadir}/zsh

vendor.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f95dfcaad1a73f827eb60fa653461977a1ed5b6cfebb34aaf525678175c4d24c
-size 26509480
+oid sha256:e90e85ad95fee43a7e2823c5ee51854637e5c03fc5f66c74b0895d18f67d05f0
+size 26611152