land b_md onto HEAD. the highlights:

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

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index c71fdc6..dd1e33c 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -3,6 +3,7 @@
 %define kversion @RELEASE@
 %define linuxdir @LINUX@
 %define portalsdir @PORTALS@
+%define portalslibdir @PORTALSLIB@
 Release: 0208282230chaos
 
 Summary: Lustre Lite File System
@@ -10,7 +11,7 @@ Name: lustre-lite
 Version: %{version}
 Copyright: GPL
 Group: Utilities/System
-Requires: lustre-modules
+Requires: lustre-modules, PyXML
 BuildRoot: /var/tmp/lustre-%{version}-root
 Source: ftp://ftp.lustre.com/pub/lustre/lustre-%{version}.tar.gz
 
@@ -26,6 +27,13 @@ Group: Development/Kernel
 %description -n lustre-modules
 Lustre file System, server and network drivers for Linux %{kversion}.
 
+%package -n lustre-source
+Summary: Object-Based Disk storage driver source
+Group: Development/Kernel
+
+%description -n lustre-source
+Lustre Lite Source for further development
+
 %package -n lustre-doc
 Summary: Documentation and sample configuration files
 Group: Documentation
@@ -35,13 +43,6 @@ Group: Documentation
 %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
-
-%description -n lustre-source
-Lustre Lite Source for further development
-
 %prep
 %setup -qn lustre-%{version}
 
@@ -49,27 +50,28 @@ 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 --with-linux='%{linuxdir}' --with-portals='%{portalsdir}' --with-portalslib='%{portalslibdir}'
 make
 
 %install
 make install prefix=$RPM_BUILD_ROOT
 
 # Create the pristine source directory.
-make distclean
-mkdir -p $RPM_BUILD_ROOT/usr/src/lustre-%{version}
-find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
-
+mkdir -p $RPM_BUILD_ROOT/usr/src
+rm -f lustre-source
+ln -s $RPM_BUILD_ROOT/usr/src lustre-source
+make distdir distdir=lustre-source/lustre-%{version}
 
 %files
 %attr(-, root, root) /usr/sbin/lmc
 %attr(-, root, root) /usr/sbin/lctl
 %attr(-, root, root) /usr/sbin/lconf
-%attr(-, root, root) /usr/sbin/llsetup.sh
-%attr(-, root, root) /usr/sbin/llrsetup.sh
-%attr(-, root, root) /usr/sbin/llcleanup.sh
-%attr(-, root, root) /lib/lustre/common.sh
-%attr(-, root, root) /etc/lustre/lustre.cfg
+%attr(-, root, root) /usr/lib/lustre/examples/llmount.sh
+%attr(-, root, root) /usr/lib/lustre/examples/llmountcleanup.sh
+%attr(-, root, root) /usr/lib/lustre/examples/llecho.sh
+%attr(-, root, root) /usr/lib/lustre/examples/local.sh
+%attr(-, root, root) /usr/lib/lustre/examples/uml.sh
+%attr(-, root, root) /usr/lib/lustre/examples/lov.sh
 %attr(-, root, root) /etc/init.d/lustre
 
 %files -n lustre-doc
@@ -90,7 +92,7 @@ find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
 %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/fsfilt_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