LU-12616 obclass: fix MDS start/stop race

[fs/lustre-release.git] / lustre-dkms.spec.in

diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in
index c6b4cc0..e93c851 100644 (file)
--- a/lustre-dkms.spec.in
+++ b/lustre-dkms.spec.in
@@ -26,7 +26,7 @@
 
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
        %global kmod_name kmod-%{lustre_name}
-       %define mkconf_options
+       %define mkconf_options %{nil}
 %else  #for Suse / Ubuntu
        %global kmod_name %{lustre_name}-kmp
        %define mkconf_options "-k updates"
@@ -58,13 +58,13 @@ BuildArch:      noarch
 Requires:       dkms >= 2.2.0.3-28.git.7c3e7c5
 # for lnetctl
 Requires:      libyaml-devel
+Requires:      zlib-devel
 %if %{with servers}
 # If client package is installed when installing server, remove it since
 # the server package also includes the client.  This can be removed if/when
 # the packages are split into independent client/server/common packages.
 Obsoletes:     @PACKAGE@-client < %{version}
 %if %{with zfs}
-Requires:       spl-dkms >= 0.6.5
 Requires:       zfs-dkms >= 0.6.5
 Requires:      @PACKAGE@-osd-zfs-mount
 Conflicts:     @PACKAGE@-ldiskfs-dkms
@@ -74,6 +74,7 @@ Provides:     @PACKAGE@-dkms
 Obsoletes:     @PACKAGE@-dkms
 %endif
 %if %{with ldiskfs}
+Requires:      patch
 Requires:      %{ext4_source_rpm}
 Requires:      @PACKAGE@-osd-ldiskfs-mount
 Conflicts:     @PACKAGE@-zfs-dkms
@@ -152,6 +153,8 @@ dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade
 exit 0
 
 %changelog
+* Wed May 16 2018 Joe Grund <joe.grund@intel.com>
+- Add patch requirement
 * Mon Aug  1 2016 Nathaniel Clark <nathaniel.l.clark@intel.com>
 - Add option to build either ldiskfs or zfs flavour of server version
 * Sat Jan 23 2016 Bruno Faccini <bruno.faccini@intel.com>