From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 19 Mar 2013 22:55:44 +0000 (-0700)
Subject: Add spl-dkms dependency to zfs-dkms
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=c0c3d83ccb3ff89c6183a3f160c05adad5805148;p=zfs.git

Add spl-dkms dependency to zfs-dkms

Adding the 'spl-dkms = VERSION' dependency to the zfs-dkms
package ensures the spl will be installed before zfs.  This
cleanly handles the initial 'yum localinstall' case.

However, this does not address the dkms rebuilds caused by
a new kernel being installed.  For that we still rely on the
clunky  --with-spl-timeout=<timeout> configure option which
allows the zfs compilation to be briefly delayed while the
spl components are built.

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 3713b1a..445c390 100644
--- a/rpm/generic/zfs-dkms.spec.in
+++ b/rpm/generic/zfs-dkms.spec.in
@@ -15,6 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 Requires:       dkms >= 2.2.0.2
+Requires:       spl-dkms = @VERSION@
 Provides:       %{module}-kmod = %{version}
 Conflicts:      %{module}-kmod