LU-3100 tests: Skip recovery-small test_111

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

diff --git a/lustre.spec.in b/lustre.spec.in
index 5d02349..d07949a 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -20,8 +20,8 @@
 %{!?lustre_name: %global lustre_name lustre}
 %{!?build_lustre_tests: %global build_lustre_tests 1}
 
-%{!?build_lustre_osd_ldiskfs: %global build_lustre_osd_ldiskfs 1}
-%{!?build_lustre_osd_zfs: %global build_lustre_osd_zfs 1}
+%{!?build_lustre_osd_ldiskfs: %global build_lustre_osd_ldiskfs 0}
+%{!?build_lustre_osd_zfs: %global build_lustre_osd_zfs 0}
 
 # in order to get kernel symset and/or kernel module dependencies into
 # the RPM, in order to support weak-modules, the internal dependency gen-
@@ -100,7 +100,7 @@ Lustre file system, server and network drivers for Linux %{kversion}.
 %if %{build_lustre_osd_ldiskfs}
 %package osd-ldiskfs
 Summary: osd-ldiskfs is the mandatory glue for LDISKFS support in Lustre.
-Requires: lustre-modules = %{version}, lustre-ldiskfs
+Requires: lustre-modules = %{version}, lustre-ldiskfs >= 4.1.0
 Provides: lustre-osd
 Group: Development/Kernel
 
@@ -115,7 +115,7 @@ backing store of a Lustre server.
 %if %{build_lustre_osd_zfs}
 %package osd-zfs
 Summary: osd-zfs is the mandatory glue for ZFS support in Lustre.
-Requires: lustre-modules = %{version}, zfs-modules
+Requires: lustre-modules = %{version}, zfs-kmod
 Provides: lustre-osd
 Group: Development/Kernel