Branch HEAD

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

diff --git a/lustre.spec.in b/lustre.spec.in
index 381ba08..9121ecf 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -5,6 +5,8 @@
 %{!?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}
@@ -25,20 +27,18 @@ Userspace tools and files for the Lustre file system.
 
 %package modules
 Summary: Kernel Lustre modules for Linux %{kversion}
-Requires: modutils >= 2.4.10, kernel = %{kversion}
+Requires: modutils >= 2.4.10, kernel = %{krequires}
 Group: Development/Kernel
 
 %description modules
 Lustre file system, server and network drivers for Linux %{kversion}.
 
-%if ! %{is_client}
 %package source
 Summary: Object-Based Disk storage driver source
 Group: Development/Kernel
 
 %description source
 Lustre sources for further development
-%endif
 
 # Since the RPMs we ship are to be used on both SLES and RHEL, we
 # can't include any dependency information (since the package names
@@ -87,6 +87,8 @@ to be used by the Lustre testing framework.
 
 %prep
 %setup -qn lustre-%{version}
+ln lustre/ChangeLog ChangeLog-lustre
+ln lnet/ChangeLog ChangeLog-lnet
 
 %build
 # if RPM_BUILD_NCPUS unset, set it
@@ -193,11 +195,11 @@ popd >/dev/null
 
 %files modules -f lustre-modules.files
 %attr(-, root, root) %doc COPYING
+%attr(-, root, root) %doc ChangeLog-lustre
+%attr(-, root, root) %doc ChangeLog-lnet
 
-%if ! %{is_client}
 %files source
 %attr(-, root, root) /usr/src/lustre-%{version}
-%endif
 
 # uncomment these lines to enable deps packages
 # %files deps-sles