From abdd50d6fa483c97de19d37dfd14cbc304b850f3 Mon Sep 17 00:00:00 2001
From: JF Ding <jian-feng.ding@intel.com>
Date: Mon, 23 Jan 2012 18:41:50 +0800
Subject: [PATCH] specify conflict to mic2 in spec

---
 distfiles/mic.spec | 4 ++--
 distfiles/mic.yaml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/distfiles/mic.spec b/distfiles/mic.spec
index 757fb30..e95c6e0 100644
--- a/distfiles/mic.spec
+++ b/distfiles/mic.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22
+# Generated by: spectacle version 0.23
 # 
 # >> macros
 # << macros
@@ -23,7 +23,6 @@ Requires:   e2fsprogs
 Requires:   dosfstools >= 2.11-8
 Requires:   yum >= 3.2.24
 Requires:   syslinux >= 3.82
-Requires:   python-urlgrabber
 Requires:   kpartx
 Requires:   parted
 Requires:   device-mapper
@@ -40,6 +39,7 @@ Requires:   btrfs-progs
 %endif
 Requires:   python-zypp >= 0.5.7
 BuildRequires:  python-devel
+Conflicts:   mic2
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 
diff --git a/distfiles/mic.yaml b/distfiles/mic.yaml
index 9a828be..51cf05a 100644
--- a/distfiles/mic.yaml
+++ b/distfiles/mic.yaml
@@ -18,6 +18,9 @@ Builder: python
 BuildArch: noarch
 SupportOtherDistros: yes
 
+Conflicts:
+    - mic2
+
 Requires:
     - util-linux
     - coreutils
-- 
2.7.4