Distribute obdfs, put modules in /lib/modules//kernel/fs/lustre.

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

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 9b50873..d7913b3 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -1,5 +1,5 @@
 # lustre.spec
-%define version 0.5.0
+%define version 0.5.1
 %define kversion @RELEASE@
 %define linuxdir @LINUX@
 %define portalsdir @PORTALS@
@@ -29,7 +29,8 @@ Lustre file System, server and network drivers for Linux %{kversion}.
 %package -n lustre-doc
 Summary: Documentation and sample configuration files
 Group: Documentation
-BuildArch: noarch
+# FIXME: BuildArch overrides all the packages in rpm 4.0.4-7x
+#BuildArch: noarch
 
 %description -n lustre-doc
 Documentation and sample configuration files for Lustre
@@ -48,7 +49,7 @@ Lustre Lite Source for further development
 rm -rf $RPM_BUILD_ROOT
 
 # Set an explicit path to our Linux tree, if we can.
-./configure --enable-linuxdir=%{linuxdir} --enable-portalsdir=%{portalsdir}
+./configure --enable-linuxdir='%{linuxdir}' --enable-portalsdir='%{portalsdir}'
 make
 
 %install
@@ -83,19 +84,20 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
 
 %files -n lustre-modules
 %attr(-, root, root) %doc COPYING
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/extN.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ldlm.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/llite.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mdc.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mds.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mds_extN.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdclass.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdecho.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdfilter.o
-#%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdfs.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/osc.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ost.o
-%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ptlrpc.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/extN.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ldlm.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/llite.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/mdc.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/mds.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/mds_extN.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdclass.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdecho.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdfilter.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/lov.o
+#%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdfs.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/osc.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ost.o
+%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ptlrpc.o
 
 %files -n lustre-source
 %attr(-, root, root) /usr/src/lustre-%{version}