diff --git a/rust.changes b/rust.changes index b384288..c11446d 100644 --- a/rust.changes +++ b/rust.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Jan 31 04:07:57 UTC 2017 - luke.nukem.jones@gmail.com +Tue Jan 31 04:25:06 UTC 2017 - luke.nukem.jones@gmail.com -- Use the same provides/conflicts as rustc-bootstrap +- Fix provides/conflicts/obsoletes ------------------------------------------------------------------- Fri Dec 23 08:22:26 UTC 2016 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index 6e1b750..8632b68 100644 --- a/rust.spec +++ b/rust.spec @@ -36,13 +36,10 @@ 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} - -Provides: rust = %{version} +Obsoletes: rustc-1_9 Provides: rustc = %{version} -Provides: rustc-stable = %{version} +Provides: rustc-stable = %{version} +Conflicts: rustc-bootstrap <= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 %{arm} aarch64