X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=676dcdc0d5e175c3b9cdf6e7508cc7b2bce15f76;hp=342c8b2533541d01283caca4d2c1da7e0652e041;hb=292757087f8dd4ab273b29440042ed702712b05a;hpb=d153b5a667249ff0ce9ff3728cfece64e8aa1ece

diff --git a/lustre.spec.in b/lustre.spec.in
index 342c8b2..676dcdc 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -1,7 +1,6 @@
 # lustre.spec
 %define version @VERSION@
 %define kversion @LINUXRELEASE@
-%define sles10build @SLES10BUILD@
 
 Summary: Lustre File System
 Name: lustre
@@ -10,7 +9,7 @@ Release: @RELEASE@
 License: GPL
 Group: Utilities/System
 Source: lustre-%{version}.tar.gz
-URL: http://clusterfs.com/
+URL: http://www.sun.com/software/products/lustre/index.xml
 BuildRoot: %{_tmppath}/lustre-%{version}-root
 Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre
 Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
@@ -23,9 +22,6 @@ Userspace tools and files for the Lustre file system.
 Summary: Kernel Lustre modules for Linux %{kversion}
 Requires: modutils >= 2.4.10
 Group: Development/Kernel
-%if %{sles10build}
-AutoReqProv: no
-%endif
 
 %description modules
 Lustre file system, server and network drivers for Linux %{kversion}.
@@ -76,7 +72,7 @@ systems.
 Summary: Lustre testing framework
 Group: Development/Kernel
 Provides: lustre-tests = %{version}
-Requires: lustre = %{version}
+Requires: lustre = %{version}, lustre-modules = %{version}
 
 %description tests
 This package contains a set of test binaries and scripts that are intended
@@ -128,6 +124,7 @@ 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}
+chmod -R go-w lustre-source/lustre-%{version}
 
 cat >lustre.files <<EOF
 %attr(-, root, root) /sbin/mount.lustre
@@ -145,6 +142,10 @@ cat >lustre.files <<EOF
 %attr(-, root, root) %{_libdir}/lustre/lc_common
 EOF
 
+if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
+  echo '%attr(-, root, root) %{_libdir}/libcfsutil.a' >>lustre.files
+fi
+
 if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then
   echo '%attr(-, root, root) %{_libdir}/liblustre.a' >>lustre.files
   echo '%attr(-, root, root) %{_libdir}/liblustre.so' >>lustre.files
@@ -161,12 +162,15 @@ fi
 
 # Have universal lustre headers 
 if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then
-  echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files
   echo '%attr(-, root, root) /usr/include/linux/lustre_user.h' >>lustre.files
 else
   echo '%attr(-, root, root) /usr/include/linux/lustre_idl.h' >>lustre.files
 fi
 
+if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ; then
+  echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files
+fi
+
 echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files
 echo '%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/llog_test.*' >>lustre-tests.files
 modules_excludes="llog_test"
@@ -198,6 +202,9 @@ if [ -f /boot/System.map-%{kversion} ]; then
 else
 	depmod -ae %{kversion} || exit 0
 fi
+cat <<EOF
+Lustre package installation complete.
+EOF
 
 # for update from < v1.4.6
 
@@ -221,7 +228,6 @@ do
 	fi
 done
 
-
 %postun modules
 if [ -f /boot/System.map-%{kversion} ]; then
 	depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
@@ -229,5 +235,19 @@ else
 	depmod -ae %{kversion} || exit 0
 fi
 
+%post tests
+if [ -f /boot/System.map-%{kversion} ]; then
+	depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
+else
+	depmod -ae %{kversion} || exit 0
+fi
+
+%postun tests
+if [ -f /boot/System.map-%{kversion} ]; then
+	depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
+else
+	depmod -ae %{kversion} || exit 0
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT