X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=afb50166903608bccbee1945499cef66c4dde620;hp=6a8ec1b164665d61d6d9a421553fddff5ae86cd3;hb=2a7e1688e2c9bff8f18f5596c112c445d0039e94;hpb=c844bf47dabeee3f408be049b28e67e600348e0c

diff --git a/lustre.spec.in b/lustre.spec.in
index 6a8ec1b..afb5016 100644
--- 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
 
@@ -258,6 +258,8 @@ rm -f lustre-source
 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