Use req->page instead of req->addr inside echo_commitrw, as the latter is

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

diff --git a/lustre/scripts/obd.spec b/lustre/scripts/obd.spec
index 744e866..af79292 100644 (file)
--- a/lustre/scripts/obd.spec
+++ b/lustre/scripts/obd.spec
@@ -1,5 +1,5 @@
 # obd.spec
-%define version 0.005
+%define version 0.007
 %define kversion 2.4.9
 %define aclevel ac10
 %define izolevel 2
@@ -9,27 +9,43 @@ Release: 0
 %define knamever %{kversion}_%{aclevel}
 %define bdir $RPM_BUILD_DIR/obd-%{version}-%{knamever}
 
-Summary: Object-Based Disk storage drivers for Linux %{kuname}
-Name: obd
+Summary: Object-Based Disk utility programs
+Name: lustre
 Version: %{version}
-Requires: kernel-intermezzo = %{knamever}_%{izolevel}
 Copyright: GPL
-Group: Development/Kernel
+Group: Utilities/System
+Requires: lustre-modules, perl-Storable, perl-Term-ReadLine-Gnu
 BuildRoot: /var/tmp/obd-%{version}-root
-
-#
-# Sources
-Source0: ftp://ftp.lustre.com/pub/lustre/obd-%{version}.tar.gz
+Source: ftp://ftp.lustre.com/pub/lustre/obd-%{version}.tar.gz
 
 %description
+Object-Based Disk utilities and demonstration scripts.
+
+%package -n lustre-modules
+Summary: Object-Based Disk storage drivers for Linux %{kuname}
+Group: Development/Kernel
+#Requires: kernel-intermezzo = %{knamever}_%{izolevel}
+
+%description -n lustre-modules
 Object-Based Disk storage drivers for Linux %{kuname}.
 
+%package -n lustre-source
+Summary: Object-Based Disk storage driver source
+Group: Development/Kernel
+
+%description -n lustre-source
+Object-Based Disk storage driver source.
+
 %prep
-%setup
+%setup -n obd-%{version}
 
 %build
 rm -rf $RPM_BUILD_ROOT
 
+# Create the pristine source directory.
+mkdir -p $RPM_BUILD_ROOT/usr/src/obd-%{version}
+tar -cf - . | (cd $RPM_BUILD_ROOT/usr/src/obd-%{version} && tar -xvBpf -)
+
 # Set an explicit path to our Linux tree, if we can.
 enable=
 linuxdir=/usr/src/linux-%{kuname}
@@ -38,10 +54,27 @@ test -d $linuxdir && enable=--enable-linuxdir=$linuxdir
 make
 
 %install
-make install PREFIX=$RPM_BUILD_ROOT
+make install prefix=$RPM_BUILD_ROOT
 
 %files
-/lib/modules/%{kuname}
+%attr(-, root, root) %doc COPYING FDL
+%attr(-, root, root) %doc doc/API.txt doc/OBD-HOWTO.sgml doc/obdspec.sgml
+%attr(-, root, root) %doc doc/OLVM.txt doc/figs doc/notes.txt
+%attr(-, root, root) %doc doc/obdtrace_demo.txt
+%attr(-, root, root) /usr/bin/obdcontrol
+
+%files -n lustre-modules
+%attr(-, root, root) %doc COPYING
+%attr(-, root, root) /lib/modules/%{kuname}/fs/obd*.o
+
+%files -n lustre-source
+%attr(-, root, root) /usr/src/obd-%{version}
+
+%post
+depmod -ae || exit 0
+
+%postun
+depmod -ae || exit 0
 
 %clean
 #rm -rf $RPM_BUILD_ROOT