Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rust1.55 for openSUSE:Factory
checked in at 2021-10-30 23:13:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rust1.55 (Old)
and /work/SRC/openSUSE:Factory/.rust1.55.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rust1.55"
Sat Oct 30 23:13:15 2021 rev:2 rq:927395 version:1.55.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rust1.55/rust1.55.changes 2021-09-20
23:35:48.451370328 +0200
+++ /work/SRC/openSUSE:Factory/.rust1.55.new.1890/rust1.55.changes
2021-10-30 23:14:19.747084073 +0200
@@ -1,0 +2,13 @@
+Mon Oct 18 01:33:07 UTC 2021 - William Brown <william.br...@suse.com>
+
+- Swap to internal libgit due to issue in current platform libgit2
+- Remove un-needed compiler docs
+- Cleanup rpmlints
+- Remove conflicting shell completions
+
+-------------------------------------------------------------------
+Thu Oct 7 04:59:49 UTC 2021 - William Brown <william.br...@suse.com>
+
+- Remove developer tools in favour of rustup
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rust1.55.spec ++++++
--- /var/tmp/diff_new_pack.cmmGjV/_old 2021-10-30 23:14:27.575090371 +0200
+++ /var/tmp/diff_new_pack.cmmGjV/_new 2021-10-30 23:14:27.579090375 +0200
@@ -82,12 +82,6 @@
# but may not always work.
#
-%ifarch x86_64 aarch64
-%bcond_without tier1
-%else
-%bcond_with tier1
-%endif
-
# === broken distro llvm ===
# In some situations the llvm provided on the platform may not work.
# we add these conditions here.
@@ -183,8 +177,10 @@
%endif
BuildRequires: cmake
BuildRequires: gcc-c++
+%ifarch %{arm} %{ix86}
BuildRequires: pkgconfig(libgit2)
BuildRequires: pkgconfig(libssh2) >= 1.6.0
+%endif
%if !%with bundled_llvm
%if 0%{?sle_version} >= 150000 && 0%{?sle_version} <= 150400
@@ -209,6 +205,9 @@
Conflicts: rust-std-static < %{version}
Obsoletes: rust-std-static < %{version}
Provides: rust-std-static = %{version}
+Conflicts: rust-gdb < %{version}
+Obsoletes: rust-gdb < %{version}
+Provides: rust-gdb = %{version}
# Restrict the architectures as building rust relies on being
# initially bootstrapped before we can build the n+1 release
@@ -231,73 +230,6 @@
of a high-level language. Even then, Rust still allows precise control
like a low-level language would.
-%package doc
-Summary: Rust documentation
-License: Apache-2.0 OR MIT
-Group: Development/Languages/Rust
-Obsoletes: rust-doc < %{version}
-Provides: rust-doc = %{version}
-
-%description doc
-Documentation for the Rust language.
-
-%package gdb
-Summary: Gdb integration for rust binaries
-License: Apache-2.0 OR MIT
-Group: Development/Languages/Rust
-Requires: rust-std = %{version}
-Obsoletes: rust+gdb < %{version}
-Provides: rust+gdb = %{version}
-
-%description gdb
-This subpackage provides pretty printers and a wrapper script for
-invoking gdb on rust binaries.
-
-%package src
-Summary: Sources for the Rust standard library
-License: Apache-2.0 OR MIT
-Group: Development/Languages/Rust
-BuildArch: noarch
-Requires: rust-std = %{version}
-Obsoletes: rust-src < %{version}
-Provides: rust-src = %{version}
-
-%description src
-This package includes source files for the Rust standard library. This
-is commonly used for function detail lookups in helper programs such
-as RLS or racer.
-
-%package -n rls%{version_suffix}
-Summary: Language server for Rust lang
-License: Apache-2.0 OR MIT
-Group: Development/Languages/Rust
-Requires: rust-analysis = %{version}
-Requires: rust-src = %{version}
-Requires: rust-std = %{version}
-Obsoletes: rust+rls < %{version}
-Provides: rust+rls = %{version}
-
-%description -n rls%{version_suffix}
-The RLS provides a server that runs in the background, providing IDEs,
-editors, and other tools with information about Rust programs. It
-supports functionality such as 'goto definition', symbol search,
-reformatting, and code completion, and enables renaming and
-refactorings. It can be used with an IDE such as Gnome-Builder.
-
-%package analysis
-Summary: Compiler analysis data for the Rust standard library
-License: Apache-2.0 OR MIT
-Group: Development/Languages/Rust
-Requires: rust-std = %{version}
-Obsoletes: rust-analysis < %{version}
-Provides: rust-analysis = %{version}
-
-%description analysis
-This package contains analysis data files produced with rustc's
--Zsave-analysis feature for the Rust standard library. The RLS (Rust
-Language Server) uses this data to provide information about the Rust
-standard library.
-
%package -n cargo%{version_suffix}
Summary: The Rust package manager
License: Apache-2.0 OR MIT
@@ -307,30 +239,10 @@
Provides: cargo-vendor = %{version}
Obsoletes: rust+cargo < %{version}
Provides: rust+cargo = %{version}
-Obsoletes: rustfmt < %{version}
-Provides: rustfmt = %{version}
-Obsoletes: cargo-fmt < %{version}
-Provides: cargo-fmt = %{version}
-Obsoletes: clippy < %{version}
-Provides: clippy = %{version}
%description -n cargo%{version_suffix}
Cargo downloads dependencies of Rust projects and compiles it.
-%package -n cargo%{version_suffix}-doc
-Summary: Documentation for Cargo
-# Cargo no longer builds its own documentation
-# https://github.com/rust-lang/cargo/pull/4904
-License: Apache-2.0 OR MIT
-Group: Development/Languages/Rust
-Requires: rust-std = %{version}
-Obsoletes: cargo-doc < %{version}
-Provides: cargo-doc = %{version}
-BuildArch: noarch
-
-%description -n cargo%{version_suffix}-doc
-This package includes HTML documentation for Cargo.
-
%prep
%ifarch x86_64
%setup -q -T -b 100 -n rust-%{version_current}-%{rust_triple}
@@ -420,8 +332,8 @@
--enable-optimize \
%{?with_sccache: --enable-sccache} \
%{!?with_sccache: --enable-ccache} \
- %{?with_tier1: --enable-docs} \
- %{!?with_tier1: --disable-docs} \
+ --disable-docs \
+ --disable-compiler-docs \
--enable-verbose-tests \
--disable-jemalloc \
--disable-rpath \
@@ -429,11 +341,7 @@
%{debug_info} \
--enable-vendor \
--enable-extended \
-%if %{with tier1}
- --tools="cargo","rls","clippy","rustfmt","analysis","src" \
-%else
- --tools="cargo","src" \
-%endif
+ --tools="cargo" \
--release-channel="stable"
# Sometimes we may be rebuilding with the same compiler,
@@ -450,6 +358,7 @@
export RUSTFLAGS="%{rustflags}"
export DESTDIR=%{buildroot}
export LIBSSH2_SYS_USE_PKG_CONFIG=1
+export CARGO_FEATURE_VENDORED=1
# END EXPORTS
EOF
@@ -462,40 +371,15 @@
unset FFLAGS
./x.py build -v
-%if %{with tier1}
-./x.py doc -v --stage 1
-%endif
%install
# Reread exports file
. ./.env.sh
./x.py install
-./x.py install src
# Remove executable permission from HTML documentation
# to prevent RPMLINT errors.
-%if %{with tier1}
-chmod -R -x+X %{buildroot}%{_docdir}/rust/html
-
-# Remove lockfile to avoid errors.
-rm %{buildroot}%{_docdir}/rust/html/.lock
-
-# Sanitize the HTML documentation
-find %{buildroot}%{_docdir}/rust/html -empty -delete
-find %{buildroot}%{_docdir}/rust/html -type f -exec chmod -x '{}' '+'
-find %{buildroot}%{_docdir}/rust/html -type f -name '.nojekyll' -exec rm -v
'{}' '+'
-
-# The html docs for x86 and x86_64 are the same in most places
-%fdupes -s %{buildroot}%{_docdir}/%{name}/html
-%fdupes -s %{buildroot}/%{_mandir}
-%fdupes %{buildroot}/%{_prefix}
-
-# Cargo no longer builds its own documentation
-# https://github.com/rust-lang/cargo/pull/4904
-mkdir -p %{buildroot}%{_docdir}/cargo
-ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html
-%endif
# Remove the license files from _docdir: make install put duplicates there
rm %{buildroot}%{_docdir}/rust/{README.md,COPYRIGHT,LICENSE*}
@@ -511,9 +395,6 @@
find %{buildroot}%{rustlibdir} -type f -name '.clang-format' -exec rm -v '{}'
'+'
find %{buildroot}%{rustlibdir} -type d -name '.github' -exec rm -r -v '{}' '+'
-# Remove exec bits from scripts in the src pkg
-find %{buildroot}%{rustlibdir}/src/ -type f -exec chmod -x '{}' '+'
-
# The shared libraries should be executable to allow fdupes find duplicates.
find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' -exec chmod
-v +x '{}' '+'
@@ -527,8 +408,10 @@
# Create the path for crate-devel packages
mkdir -p %{buildroot}%{_datadir}/cargo/registry
-# Move the bash-completion to correct directory for openSUSE
-install -D %{buildroot}%{_sysconfdir}/bash_completion.d/cargo
%{buildroot}%{_datadir}/bash-completion/completions/cargo
+# Remove completions
+rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d
+rm -rf %{buildroot}%{_datadir}/zsh
+
# There should be nothing here at all
rm -rf %{buildroot}%{_sysconfdir}
# cargo does not respect our _libexec setting on Leap:
@@ -549,24 +432,14 @@
%doc CONTRIBUTING.md README.md RELEASES.md
%{_bindir}/rustc
%{_bindir}/rustdoc
+%{_bindir}/rust-gdb
+%{_bindir}/rust-gdbgui
%{_bindir}/rust-lldb
%{_bindir}/rust-llvm-dwp
%{_mandir}/man1/rustc.1%{?ext_man}
%{_mandir}/man1/rustdoc.1%{?ext_man}
%{_prefix}/lib/lib*.so
%dir %{rustlibdir}
-%dir %{rustlibdir}/%{rust_triple}
-%dir %{rustlibdir}/%{rust_triple}/lib
-%{rustlibdir}/%{rust_triple}/lib/*.so
-%{rustlibdir}/%{rust_triple}/lib/*.rlib
-%{_libexecdir}/cargo-credential-1password
-%exclude %{_docdir}/rust/html
-%exclude %{rustlibdir}/src
-
-%files gdb
-%{_bindir}/rust-gdb
-%{_bindir}/rust-gdbgui
-%dir %{rustlibdir}
%dir %{rustlibdir}%{_sysconfdir}
%{rustlibdir}%{_sysconfdir}/gdb_load_rust_pretty_printers.py
%{rustlibdir}%{_sysconfdir}/gdb_lookup.py
@@ -575,57 +448,19 @@
%{rustlibdir}%{_sysconfdir}/lldb_lookup.py
%{rustlibdir}%{_sysconfdir}/lldb_providers.py
%{rustlibdir}%{_sysconfdir}/rust_types.py
-
-%if %{with tier1}
-%files doc
-%dir %{_docdir}/rust
-%dir %{_docdir}/rust/html
-%doc %{_docdir}/rust/html/*
-%endif
-
-%files src
-%dir %{rustlibdir}
-%{rustlibdir}/src
-
-%if %{with tier1}
-%files -n rls%{version_suffix}
-%license src/tools/rls/LICENSE-{APACHE,MIT}
-%doc src/tools/rls/{README.md,COPYRIGHT,debugging.md}
-%{_bindir}/rls
-%endif
-
-%if %{with tier1}
-%files analysis
-%{rustlibdir}/%{rust_triple}/analysis/
-%endif
+%dir %{rustlibdir}/%{rust_triple}
+%dir %{rustlibdir}/%{rust_triple}/lib
+%{rustlibdir}/%{rust_triple}/lib/*.so
+%{rustlibdir}/%{rust_triple}/lib/*.rlib
+%{_libexecdir}/cargo-credential-1password
%files -n cargo%{version_suffix}
%license src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY}
%license src/tools/rustfmt/LICENSE-{APACHE,MIT}
%license src/tools/clippy/LICENSE-{APACHE,MIT}
%{_bindir}/cargo
-%if %{with tier1}
-%{_bindir}/cargo-fmt
-%{_bindir}/rustfmt
-%{_bindir}/cargo-clippy
-%{_bindir}/clippy-driver
-%doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
-%doc src/tools/clippy/{README.md,CHANGELOG.md}
-%endif
%{_mandir}/man1/cargo*.1%{?ext_man}
-%dir %{_datadir}/bash-completion
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/cargo
-%dir %{_datadir}/zsh
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_cargo
%dir %{_datadir}/cargo
%dir %{_datadir}/cargo/registry
-%if %{with tier1}
-%files -n cargo%{version_suffix}-doc
-%dir %{_docdir}/cargo
-%{_docdir}/cargo/html
-%endif
-
%changelog
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.cmmGjV/_old 2021-10-30 23:14:27.611090400 +0200
+++ /var/tmp/diff_new_pack.cmmGjV/_new 2021-10-30 23:14:27.611090400 +0200
@@ -9,11 +9,8 @@
<size unit="G">40</size>
</disk>
</hardware>
-<!-- armv6 and armv7 are smaller platforms so we should request less -->
<overwrite>
<conditions>
- <arch>armv6l</arch>
- <arch>armv7l</arch>
<arch>ppc</arch>
</conditions>
<hardware>
@@ -28,6 +25,8 @@
<overwrite>
<conditions>
<arch>aarch64</arch>
+ <arch>armv6l</arch>
+ <arch>armv7l</arch>
</conditions>
<hardware>
<physicalmemory>
++++++ rust1.55-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.cmmGjV/_old 2021-10-30 23:14:27.711090481 +0200
+++ /var/tmp/diff_new_pack.cmmGjV/_new 2021-10-30 23:14:27.711090481 +0200
@@ -1,39 +1,19 @@
# we are exporting the buildroot, not changing it, this lint is wrong.
addFilter("rpm-buildroot-usage")
-# filters for rust-src
-addFilter("devel-dependency rust-std-static")
-addFilter("devel-file-in-non-devel-package.*/usr/lib/rustlib/src/.*")
-
# rlib not in elf format
-addFilter("binaryinfo-readelf-failed.*/usr/lib/rustlib/.*rlib")
+# addFilter("binaryinfo-readelf-failed.*/usr/lib/rustlib/.*rlib")
# rust has no stable ABI as of yet, soname is of no use yet
addFilter("no-soname.*/usr/lib/rustlib/.*")
addFilter("no-soname.*/usr/lib/lib*")
-# tool versions don't always change at same pace as rustc
-addFilter("clippy.x86_64: W: no-version-in-last-changelog")
-addFilter("rls.x86_64: W: no-version-in-last-changelog")
-addFilter("rust-analysis.x86_64: W: no-version-in-last-changelog")
-addFilter("rustfmt.x86_64: W: no-version-in-last-changelog")
-
-# we use a "provides =" with version to set the version correctly
-addFilter("clippy.x86_64: W: useless-provides clippy")
-addFilter("rustfmt.x86_64: W: useless-provides rustfmt")
-
# error when building with bootstrap. ignore for now
-addFilter(".*shlib-policy-name-error.*libLLVM-11.*")
-
-# Ignore some upstream scripts behaviours
-addFilter("non-executable-script /usr/lib/rustlib/src/rust/library/.*")
-addFilter("script-without-shebang /usr/lib/rustlib/src/rust/library/.*")
-addFilter("script-without-shebang
/usr/share/bash-completion/completions/cargo")
-
-# The src package has some duplicates because of upstream copy-paste
-addFilter("files-duplicate /usr/lib/rustlib/src/rust/library/.*")
+# addFilter(".*shlib-policy-name-error.*libLLVM-11.*")
# Rustc driver calls exit, this is fine
-addFilter(".*shared-lib-calls-exit.*/usr/lib/librustc_driver.*")
+# addFilter(".*shared-lib-calls-exit.*/usr/lib/librustc_driver.*")
+addFilter("potential-bashisms.*/usr/bin/rust-lldb")
+addFilter("position-independent-executable-suggested.*/usr/bin/rust-llvm-dwp")
