From 0c051b70c7bec6ed35a7bcd524508a9c62450d728083d14975a026a309566308 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Tue, 31 Jan 2017 03:15:13 +0000 Subject: [PATCH] - Fix RPM conflicts. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=25 --- rust.changes | 5 +++++ rust.spec | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rust.changes b/rust.changes index 0a136d5..fccca69 100644 --- a/rust.changes +++ b/rust.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 31 03:14:38 UTC 2017 - luke.nukem.jones@gmail.com + +- Fix RPM conflicts. + ------------------------------------------------------------------- Fri Dec 23 08:22:26 UTC 2016 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index e04acf8..2695fe7 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,7 @@ # # spec file for package rust # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,9 +36,8 @@ BuildRequires: python Recommends: cargo #FIXME: currently there's no way to have rustc and rustc-beta installed -Conflicts: rust < %{version} -Conflicts: rustc <= %{version} -Conflicts: rustc-bootstrap <= %{version} +Conflicts: rustc +Conflicts: rustc-bootstrap BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 %{arm} aarch64