From 39ee97f5efb5b8d957748a59ec635da849e714d66ff9a610f4c8da04bb3391ca Mon Sep 17 00:00:00 2001
From: Luke Jones <luke@ljones.dev>
Date: Sat, 10 Nov 2018 20:08:32 +0000
Subject: [PATCH] Accepting request 647670 from
 home:luke_nukem:branches:devel:languages:rust

- Add Provides/Obsoletes/Conflicts to rust-std-static and cargo

OBS-URL: https://build.opensuse.org/request/show/647670
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=169
---
 rust.changes | 5 +++++
 rust.spec    | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rust.changes b/rust.changes
index 7825101..c601917 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov  9 06:42:47 UTC 2018 - Luke Jones <jones_ld@protonmail.com>
+
+- Add Provides/Obsoletes/Conflicts to rust-std-static and cargo
+
 -------------------------------------------------------------------
 Thu Nov  8 01:17:22 UTC 2018 - Neal Gompa <ngompa13@gmail.com>
 
diff --git a/rust.spec b/rust.spec
index 993a33e..436c74a 100644
--- a/rust.spec
+++ b/rust.spec
@@ -142,7 +142,9 @@ Summary:        Standard library for Rust
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
 Requires:       %{name} = %{version}
-Conflicts:      rust-std
+Obsoletes:      rust-std < %{version}
+Conflicts:      rust-std < %{version}
+Provides:       rust-std = %{version}
 
 %description -n rust-std-static
 This package includes the standard libraries for building
@@ -247,7 +249,8 @@ Summary:        The Rust package manager
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
 Requires:       %{name} = %{version}
-Conflicts:      cargo
+Obsoletes:      cargo < %{version}
+Conflicts:      cargo < %{version}
 Provides:       rustc:%{_bindir}/cargo = %{version}
 
 %description -n cargo