From 1411d89e949682a6364f0eab3427a8bd52aa6020 Mon Sep 17 00:00:00 2001 From: James Antill Date: Jan 04 2011 16:39:30 +0000 Subject: Add the conflicts from upstream. --- diff --git a/yum.spec b/yum.spec index ec6a2f7..a25f7bf 100644 --- a/yum.spec +++ b/yum.spec @@ -43,6 +43,25 @@ Requires: python-sqlite Requires: python-urlgrabber >= 3.9.0-8 Requires: yum-metadata-parser >= 1.1.0 Requires: pygpgme + +Conflicts: yum-skip-broken +Conflicts: rpm >= 5-0 +# Zif is a re-implementation of yum in C, however: +# +# 1. There is no co-operation/etc. with us. +# 2. It touches our private data directly. +# +# ...both of which mean that even if there were _zero_ bugs in zif, we'd +# never be able to change anything after the first user started using it. And +# of course: +# +# 3. Users will never be able to tell that it isn't weird yum bugs, when they +# hit them (and we'll probably never be able to debug them, without becoming +# zif experts). +# +# ...so we have two sane choices: i) Conflict with it. 2) Stop developing yum. +Conflicts: zif + Obsoletes: yum-skip-broken <= 1.1.18 Provides: yum-skip-broken = 1.1.18.yum Obsoletes: yum-basearchonly <= 1.1.9