%{!?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-
%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
%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
ln -s $RPM_BUILD_ROOT/usr/src lustre-source
make distdir distdir=lustre-source/lustre-%{version}
chmod -R go-w lustre-source/lustre-%{version}
+# fc18 needs 'x' permission for library files
+find $RPM_BUILD_ROOT -name '*.so' | xargs chmod +x
cat >lustre.files <<EOF
%attr(-, root, root) /sbin/mount.lustre