From 5ba900c64bfd8f167b6b84bec2b9891d1333603a64279cf1c539ad35a3bc707b Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Thu, 8 Nov 2018 01:20:39 +0000
Subject: [PATCH] - 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
---
 rust.changes |  7 +++++++
 rust.spec    | 16 +++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/rust.changes b/rust.changes
index d249598..7825101 100644
--- a/rust.changes
+++ b/rust.changes
@@ -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>
 
diff --git a/rust.spec b/rust.spec
index f626f28..993a33e 100644
--- a/rust.spec
+++ b/rust.spec
@@ -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}