Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rustup for openSUSE:Factory checked in at 2021-11-08 17:23:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rustup (Old) and /work/SRC/openSUSE:Factory/.rustup.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rustup" Mon Nov 8 17:23:52 2021 rev:2 rq:928441 version:1.24.3~git1.0a74fef5 Changes: -------- --- /work/SRC/openSUSE:Factory/rustup/rustup.changes 2021-10-11 15:32:20.898915291 +0200 +++ /work/SRC/openSUSE:Factory/.rustup.new.1890/rustup.changes 2021-11-08 17:24:05.492689649 +0100 @@ -1,0 +2,25 @@ +Mon Nov 1 00:37:07 UTC 2021 - William Brown <william.br...@suse.com> + +- Add ownership of directories that are considered unowned in leap15.3 + +------------------------------------------------------------------- +Mon Oct 11 04:25:24 UTC 2021 - william.br...@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 <mroste...@suse.com> + +- 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. + +------------------------------------------------------------------- Old: ---- rustup-1.24.3~git0.ce5817a9.tar.xz New: ---- rustup-1.24.3~git1.0a74fef5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rustup.spec ++++++ --- /var/tmp/diff_new_pack.JGVYvW/_old 2021-11-08 17:24:06.452690279 +0100 +++ /var/tmp/diff_new_pack.JGVYvW/_new 2021-11-08 17:24:06.456690283 +0100 @@ -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 @@ %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,8 +78,31 @@ # 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 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.JGVYvW/_old 2021-11-08 17:24:06.480690298 +0100 +++ /var/tmp/diff_new_pack.JGVYvW/_new 2021-11-08 17:24:06.480690298 +0100 @@ -1,9 +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/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="scm">git</param> - <param name="revision">1.24.3</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~git0.ce5817a9.tar.xz -> rustup-1.24.3~git1.0a74fef5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rustup-1.24.3~git0.ce5817a9/src/cli/self_update.rs new/rustup-1.24.3~git1.0a74fef5/src/cli/self_update.rs --- old/rustup-1.24.3~git0.ce5817a9/src/cli/self_update.rs 2021-05-31 21:58:59.000000000 +0200 +++ new/rustup-1.24.3~git1.0a74fef5/src/cli/self_update.rs 2021-10-11 06:23:49.000000000 +0200 @@ -159,8 +159,8 @@ This can be modified with the CARGO_HOME environment variable. -The `cargo`, `rustc`, `rustup` and other commands will be added to -Cargo's bin directory, located at: +The `cargo`, `rustc` and other commands will be added to Cargo's +bin directory, located at: {cargo_home_bin} @@ -679,7 +679,11 @@ if rustup_path.exists() { utils::remove_file("rustup-bin", &rustup_path)?; } - utils::copy_file(&this_exe_path, &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::make_executable(&rustup_path)?; install_proxies() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rustup-1.24.3~git0.ce5817a9/src/utils/utils.rs new/rustup-1.24.3~git1.0a74fef5/src/utils/utils.rs --- old/rustup-1.24.3~git0.ce5817a9/src/utils/utils.rs 2021-05-31 21:58:59.000000000 +0200 +++ new/rustup-1.24.3~git1.0a74fef5/src/utils/utils.rs 2021-10-11 06:23:49.000000000 +0200 @@ -304,7 +304,7 @@ } #[cfg(unix)] -pub fn symlink_file(src: &Path, dest: &Path) -> Result<()> { +pub(crate) 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 fn symlink_file(src: &Path, dest: &Path) -> Result<()> { +pub(crate) 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.1890/vendor.tar.xz differ: char 27, line 1
