From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 20 Mar 2013 18:28:00 +0000 (-0700)
Subject: Remove zfs-dkms conflict with zfs-kmod
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=7865606a6a02daf8b4b20fc95dc02eec100a0523;p=zfs.git

Remove zfs-dkms conflict with zfs-kmod

Because the zfs-dkms package also provides zfs-kmod for the
zfs user package yum flags this as a conflict.  To avoid the
problem remove the Conflicts tag from zfs-dkms and just rely
on the one in zfs-kmod.

  zfs-dkms-0.6.0-rc14.fc18.noarch has installed conflicts
    zfs-kmod: zfs-dkms-0.6.0-rc14.fc18.noarch

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
---

diff --git a/rpm/generic/zfs-dkms.spec.in b/rpm/generic/zfs-dkms.spec.in
index fe053ae..07a9f6d 100644
--- a/rpm/generic/zfs-dkms.spec.in
+++ b/rpm/generic/zfs-dkms.spec.in
@@ -17,7 +17,6 @@ BuildArch:      noarch
 Requires:       dkms >= 2.2.0.2
 Requires:       spl-dkms = %{version}
 Provides:       %{module}-kmod = %{version}
-Conflicts:      %{module}-kmod
 
 %description
 This package contains the dkms ZFS kernel modules.