[yum] Add version specifier to zif conflict.

James Antill james at fedoraproject.org
Thu Jan 6 03:52:50 UTC 2011


commit be167251c7852bf01113b1572b9744a4373ee1fe
Author: James Antill <james at and.org>
Date:   Wed Jan 5 22:52:33 2011 -0500

    Add version specifier to zif conflict.

 yum.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/yum.spec b/yum.spec
index ca56c48..3e9b9c1 100644
--- a/yum.spec
+++ b/yum.spec
@@ -59,7 +59,9 @@ Conflicts: rpm >= 5-0
 # zif experts).
 #
 # ...so we have two sane choices: i) Conflict with it. 2) Stop developing yum.
-Conflicts: zif
+#
+#  Upstream says that #2 will no longer be true after this release.
+Conflicts: zif <= 0.1.3-3.fc15
 
 Obsoletes: yum-skip-broken <= 1.1.18
 Provides: yum-skip-broken = 1.1.18.yum


More information about the scm-commits mailing list