From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 20 Mar 2013 18:33:15 +0000 (-0700)
Subject: Remove spl-dkms conflict with spl-kmod
X-Git-Tag: zfs-0.8.0-rc1~152^2~298
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19e9d8fd618e7cc6385911b5cf329d2f00c2b638;p=zfs

Remove spl-dkms conflict with spl-kmod

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

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

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

diff --git a/rpm/generic/spl-dkms.spec.in b/rpm/generic/spl-dkms.spec.in
index d395bf07a..a57441bb5 100644
--- a/rpm/generic/spl-dkms.spec.in
+++ b/rpm/generic/spl-dkms.spec.in
@@ -16,7 +16,6 @@ BuildArch:      noarch
 
 Requires:       dkms >= 2.2.0.2
 Provides:       %{module}-kmod = %{version}
-Conflicts:      %{module}-kmod
 
 %description
 This package contains the dkms kernel modules required to emulate