- Strengthen the dependency on rust-std-static to Requires

to fix crate package builds in OBS
- Use standard form rich dependencies for SUSE Linux 15 and newer

OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=168
This commit is contained in:
Neal Gompa 2018-11-08 01:20:39 +00:00 committed by Git OBS Bridge
parent e95f63d9ab
commit 5ba900c64b
2 changed files with 22 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 8 01:17:22 UTC 2018 - Neal Gompa <ngompa13@gmail.com>
- Strengthen the dependency on rust-std-static to Requires
to fix crate package builds in OBS
- Use standard form rich dependencies for SUSE Linux 15 and newer
-------------------------------------------------------------------
Tue Nov 6 12:32:37 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

View File

@ -93,8 +93,10 @@ BuildRequires: pkgconfig(libgit2) >= 0.23
BuildRequires: pkgconfig(libssh2) >= 1.4.3
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(zlib)
# The compiler is not generally useful without the std library installed
# And the std library is exactly specific to the version of the compiler
Requires: %{name}-std-static = %{version}
Recommends: %{name}-doc
Recommends: %{name}-std-static
Recommends: cargo
Conflicts: rust
Conflicts: rustc-bootstrap
@ -160,7 +162,13 @@ Summary: Gdb integration for rust binaries
License: MIT OR Apache-2.0
Group: Development/Languages/Rust
Requires: %{name} = %{version}
%if 0%{?suse_version} && 0%{?suse_version} < 1500
# Legacy SUSE-only form
Supplements: packageand(%{name}:gdb)
%else
# Standard form
Supplements: (%{name} and gdb)
%endif
Provides: rust-gdb = %{version}
%description -n rust-gdb
@ -209,7 +217,13 @@ Summary: Code formatting tool for Rust lang
License: MIT OR Apache-2.0
Group: Development/Languages/Rust
Requires: %{name} = %{version}
%if 0%{?suse_version} && 0%{?suse_version} < 1500
# Legacy SUSE-only form
Supplements: packageand(%{name}:cargo)
%else
# Standard form
Supplements: (%{name} and cargo)
%endif
Provides: cargo-fmt = %{rustfmt_version}
Provides: rustfmt = %{rustfmt_version}