summaryrefslogtreecommitdiffstats
path: root/rpm/generic
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2013-03-20 11:28:00 -0700
committerBrian Behlendorf <[email protected]>2013-03-21 12:51:06 -0700
commit7865606a6a02daf8b4b20fc95dc02eec100a0523 (patch)
treea6b278652515b0c53840a19846311c9960a08620 /rpm/generic
parentb9676003665ceee5a859253dde3305eecc215016 (diff)
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 <[email protected]>
Diffstat (limited to 'rpm/generic')
-rw-r--r--rpm/generic/zfs-dkms.spec.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/rpm/generic/zfs-dkms.spec.in b/rpm/generic/zfs-dkms.spec.in
index fe053ae0f..07a9f6d3b 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.