Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rustup for openSUSE:Factory checked in at 2022-02-15 23:57:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rustup (Old) and /work/SRC/openSUSE:Factory/.rustup.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rustup" Tue Feb 15 23:57:15 2022 rev:4 rq:954426 version:1.24.3~0 Changes: -------- --- /work/SRC/openSUSE:Factory/rustup/rustup.changes 2022-01-07 12:47:48.539904942 +0100 +++ /work/SRC/openSUSE:Factory/.rustup.new.1956/rustup.changes 2022-02-15 23:57:33.980259909 +0100 @@ -1,0 +2,7 @@ +Mon Feb 14 00:44:44 UTC 2022 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- rustup-1.24.3~git1.0a74fef5.tar.xz New: ---- rustup-1.24.3~0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rustup.spec ++++++ --- /var/tmp/diff_new_pack.8SPyNs/_old 2022-02-15 23:57:35.128263079 +0100 +++ /var/tmp/diff_new_pack.8SPyNs/_new 2022-02-15 23:57:35.136263101 +0100 @@ -29,7 +29,7 @@ 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 @@ -60,6 +60,9 @@ Obsoletes: rust-src < %{rust_version} Obsoletes: rustfmt < %{rust_version} +Conflicts: rust+cargo +Conflicts: rust+rustc + %description A tool to manager user Rust toolchains. This is generally used by developers managing multiple parallel toolchains in their environment. @@ -84,11 +87,25 @@ # 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 +114,19 @@ %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 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.8SPyNs/_old 2022-02-15 23:57:35.188263245 +0100 +++ /var/tmp/diff_new_pack.8SPyNs/_new 2022-02-15 23:57:35.192263255 +0100 @@ -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~git1.0a74fef5.tar.xz -> rustup-1.24.3~0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rustup-1.24.3~git1.0a74fef5/src/cli/self_update.rs new/rustup-1.24.3~0/src/cli/self_update.rs --- old/rustup-1.24.3~git1.0a74fef5/src/cli/self_update.rs 2021-10-11 06:23:49.000000000 +0200 +++ new/rustup-1.24.3~0/src/cli/self_update.rs 2021-05-31 21:58:59.000000000 +0200 @@ -159,8 +159,8 @@ This can be modified with the CARGO_HOME environment variable. -The `cargo`, `rustc` and other commands will be added to Cargo's -bin directory, located at: +The `cargo`, `rustc`, `rustup` and other commands will be added to +Cargo's bin directory, located at: {cargo_home_bin} @@ -679,11 +679,7 @@ if rustup_path.exists() { utils::remove_file("rustup-bin", &rustup_path)?; } - if cfg!(feature = "no-self-update") { - utils::symlink_file(&this_exe_path, &rustup_path)?; - } else { - utils::copy_file(&this_exe_path, &rustup_path)?; - } + utils::copy_file(&this_exe_path, &rustup_path)?; utils::make_executable(&rustup_path)?; install_proxies() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rustup-1.24.3~git1.0a74fef5/src/utils/utils.rs new/rustup-1.24.3~0/src/utils/utils.rs --- old/rustup-1.24.3~git1.0a74fef5/src/utils/utils.rs 2021-10-11 06:23:49.000000000 +0200 +++ new/rustup-1.24.3~0/src/utils/utils.rs 2021-05-31 21:58:59.000000000 +0200 @@ -304,7 +304,7 @@ } #[cfg(unix)] -pub(crate) fn symlink_file(src: &Path, dest: &Path) -> Result<()> { +pub fn symlink_file(src: &Path, dest: &Path) -> Result<()> { std::os::unix::fs::symlink(src, dest).with_context(|| RustupError::LinkingFile { src: PathBuf::from(src), dest: PathBuf::from(dest), @@ -312,7 +312,7 @@ } #[cfg(windows)] -pub(crate) fn symlink_file(src: &Path, dest: &Path) -> Result<()> { +pub fn symlink_file(src: &Path, dest: &Path) -> Result<()> { // we are supposed to not use symlink on windows Err(anyhow!(RustupError::LinkingFile { src: PathBuf::from(src), ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/rustup/vendor.tar.xz /work/SRC/openSUSE:Factory/.rustup.new.1956/vendor.tar.xz differ: char 26, line 1
