From a4612e106ab6613fa0e9fa691b47b8293cc1d8f57bfc82043fe91a1e423152f2 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Tue, 31 Jan 2017 04:08:54 +0000 Subject: [PATCH] - Use the same provides/conflicts as rustc-bootstrap OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=27 --- rust.changes | 4 ++-- rust.spec | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rust.changes b/rust.changes index fccca69..b384288 100644 --- a/rust.changes +++ b/rust.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Jan 31 03:14:38 UTC 2017 - luke.nukem.jones@gmail.com +Tue Jan 31 04:07:57 UTC 2017 - luke.nukem.jones@gmail.com -- Fix RPM conflicts. +- Use the same provides/conflicts as rustc-bootstrap ------------------------------------------------------------------- Fri Dec 23 08:22:26 UTC 2016 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index 25a75a2..59c9638 100644 --- a/rust.spec +++ b/rust.spec @@ -36,8 +36,13 @@ BuildRequires: python Recommends: cargo #FIXME: currently there's no way to have rustc and rustc-beta installed -Conflicts: rustc -Conflicts: rustc-bootstrap +Conflicts: rust <= %{version} +Conflicts: rustc <= %{version} +Conflicts: rustc-bootstrap < %{version} + +Provides: rust = %{version} +Provides: rustc = %{version} +Provides: rustc-stable = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 %{arm} aarch64