X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=6722587166795a923f09f3b3f298d07217ab3bdb;hp=4aa5a2ab876b53f08c08583e2c4d9acc4f2b3bcb;hb=d57062541b587184daab88d544065e04e09ede0d;hpb=5f55799d7941e7a209846f7c37b799251a276448

diff --git a/lustre.spec.in b/lustre.spec.in
index 4aa5a2a..6722587 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -1,18 +1,25 @@
 # lustre.spec
-%define version @VERSION@
-%define kversion @LINUXRELEASE@
+%{!?version: %define version @VERSION@}
+%{!?kversion: %define kversion @LINUXRELEASE@}
+%{!?release: %define release @RELEASE@}
+%{!?lustre_name: %define lustre_name lustre}
+
+%define is_client %(bash -c "if [[ %{lustre_name} = *-client ]]; then echo -n '1'; else echo -n '0'; fi")
+# for those uses that don't want the -smp/-bigsmp on the end of %kversion
+%define krequires %(bash -c "echo %{kversion} | sed -e 's/-[^0-9]*smp$//'")
 
 Summary: Lustre File System
-Name: lustre
+Name: %{lustre_name}
 Version: %{version}
-Release: @RELEASE@
+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}
+Requires: %{name}-modules = %{version}
 # GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10
 
 %description
@@ -20,7 +27,7 @@ Userspace tools and files for the Lustre file system.
 
 %package modules
 Summary: Kernel Lustre modules for Linux %{kversion}
-Requires: modutils >= 2.4.10
+Requires: modutils >= 2.4.10, kernel = %{krequires}
 Group: Development/Kernel
 
 %description modules
@@ -51,8 +58,8 @@ Lustre sources for further development
 Summary: Lustre dependencies meta-package for SLES
 Group: Utilities/System
 Provides: lustre-deps = %{version}
-Requires: lustre = %{version}, sles-release
-Conflicts: lustre-deps-rhel
+Requires: %{name} = %{version}, sles-release
+Conflicts: %{name}-deps-rhel
 
 %description deps-sles
 This package has RPM dependencies appropriate for SLES systems.
@@ -61,8 +68,8 @@ This package has RPM dependencies appropriate for SLES systems.
 Summary: Lustre dependencies meta-package for RHEL
 Group: Utilities/System
 Provides: lustre-deps = %{version}
-Requires: lustre = %{version}, redhat-release
-Conflicts: lustre-deps-sles
+Requires: %{name} = %{version}, redhat-release
+Conflicts: %{name}-deps-sles
 
 %description deps-rhel
 This package has RPM dependencies appropriate for RHEL, RHL, and FC
@@ -71,8 +78,8 @@ systems.
 %package tests
 Summary: Lustre testing framework
 Group: Development/Kernel
-Provides: lustre-tests = %{version}
-Requires: lustre = %{version}
+Provides: %{name}-tests = %{version}
+Requires: %{name} = %{version}, %{name}-modules = %{version}
 
 %description tests
 This package contains a set of test binaries and scripts that are intended
@@ -131,7 +138,7 @@ cat >lustre.files <<EOF
 %attr(-, root, root) /usr/sbin/*
 %attr(-, root, root) /usr/bin/*
 
-%attr(-, root, root) /usr/share/lustre/*
+%attr(-, root, root) /usr/share/lustre
 
 %attr(-, root, root) %{_libdir}/libptlctl.a
 %attr(-, root, root) %{_libdir}/liblustreapi.a
@@ -142,6 +149,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
@@ -158,12 +169,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"
@@ -195,6 +209,13 @@ if [ -f /boot/System.map-%{kversion} ]; then
 else
 	depmod -ae %{kversion} || exit 0
 fi
+cat <<EOF
+Congratulations on finishing your Lustre installation!  To register  
+your copy of Lustre and find out more about Lustre Support, Service,  
+and Training offerings please visit
+
+http://www.sun.com/software/products/lustre/lustre_reg.jsp
+EOF
 
 # for update from < v1.4.6