From 235dd914d594328b3a8a7554b7ac0e0a59b2ad26237dacb4a613ea5fc71799c1 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Sun, 18 Dec 2016 09:11:16 +0000 Subject: [PATCH] Accepting request 446880 from home:luke_nukem:branches:devel:languages:rust OBS-URL: https://build.opensuse.org/request/show/446880 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=20 --- rust.changes | 6 ++++++ rust.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/rust.changes b/rust.changes index 1bf70d6..9e26d70 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Dec 18 09:03:52 UTC 2016 - luke.nukem.jones@gmail.com + +- Add conflicts to help avoid situations where previous versions + or rustc-bootstrap may be installed + ------------------------------------------------------------------- Sun Dec 18 02:41:25 UTC 2016 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index 87b0a0b..2f7eb3e 100644 --- a/rust.spec +++ b/rust.spec @@ -37,12 +37,12 @@ BuildRequires: gcc-c++ BuildRequires: python Recommends: cargo #FIXME: currently there's no way to have rustc and rustc-beta installed -# some alternatives system should be implemented -Conflicts: rustc < %{version} -# renamed to match upstream and other distros + +Conflicts: rust < %{version} +Conflicts: rustc <= %{version} +Conflicts: rustc-bootstrap <= %{version} + Obsoletes: rustc-1_9 -Provides: rustc = %{version} -Provides: rustc-stable = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %if 0%{?suse_version}