Tag zfs-0.6.1

[zfs.git] / rpm / generic / zfs-dkms.spec.in

diff --git a/rpm/generic/zfs-dkms.spec.in b/rpm/generic/zfs-dkms.spec.in
index fe053ae..7d871cb 100644 (file)
--- 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.
@@ -63,6 +62,5 @@ dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade
 exit 0
 
 %changelog
-* Tue Mar 12 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.0-1
-- Initial dkms packaging.
-
+* Fri Mar 22 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.1-1
+- First official stable release.