- disable obdctl from being built; use lctl now

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

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 81165b1..5b7caea 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@
@@ -26,6 +26,15 @@ Group: Development/Kernel
 %description -n lustre-modules
 Lustre file System, server and network drivers for Linux %{kversion}.
 
+%package -n lustre-doc
+Summary: Documentation and sample configuration files
+Group: Documentation
+# 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
+
 %package -n lustre-source
 Summary: Object-Based Disk storage driver source
 Group: Development/Kernel
@@ -40,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
@@ -53,9 +62,7 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
 
 
 %files
-%attr(-, root, root) %doc COPYING FDL
-%attr(-, root, root) %doc doc/lustre.pdf doc/lustre-HOWTO.txt
-%attr(-, root, root) /usr/sbin/obdctl
+#%attr(-, root, root) /usr/sbin/obdctl
 %attr(-, root, root) /usr/sbin/lctl
 %attr(-, root, root) /usr/sbin/llsetup.sh
 %attr(-, root, root) /usr/sbin/llrsetup.sh
@@ -64,21 +71,33 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
 %attr(-, root, root) /etc/lustre/lustre.cfg
 %attr(-, root, root) /etc/init.d/lustre
 
+%files -n lustre-doc
+%attr(-, root, root) %doc COPYING FDL
+%attr(-, root, root) %doc doc/lustre.pdf doc/lustre-HOWTO.txt
+%attr(-, root, root) %doc tests/client-echo.cfg tests/client-mount.cfg
+%attr(-, root, root) %doc tests/client-mount2.cfg
+%attr(-, root, root) %doc tests/elan-client.cfg tests/elan-server.cfg
+%attr(-, root, root) %doc tests/ldlm.cfg tests/lustre.cfg
+%attr(-, root, root) %doc tests/mds.cfg tests/net-client.cfg
+%attr(-, root, root) %doc tests/net-local.cfg tests/net-server.cfg
+%attr(-, root, root) %doc tests/obdecho.cfg tests/obdfilter.cfg
+
 %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}