b=16839

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

diff --git a/lustre.spec.in b/lustre.spec.in
index 50fa9f7..5ebb38f 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -31,14 +31,12 @@ 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
@@ -75,7 +73,6 @@ Conflicts: %{name}-deps-sles
 This package has RPM dependencies appropriate for RHEL, RHL, and FC
 systems.
 
-%if ! %{is_client}
 %package tests
 Summary: Lustre testing framework
 Group: Development/Kernel
@@ -85,7 +82,6 @@ Requires: %{name} = %{version}, %{name}-modules = %{version}
 %description tests
 This package contains a set of test binaries and scripts that are intended
 to be used by the Lustre testing framework.
-%endif
 
 %prep
 %setup -qn lustre-%{version}
@@ -119,11 +115,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libsysio.a
 # Remove ldiskfs module(s) - they are packaged by the ldiskfs .spec.
 rm -rf $RPM_BUILD_ROOT/lib/modules/%{kversion}/kernel/fs/lustre-ldiskfs
 
-%if %{is_client}
-# remove the tests that were installed
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lustre/tests \
-       $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests
-%else
 # hack to include the llog_test module in lustre-tests
 llog_base=$RPM_BUILD_DIR/lustre-%{version}/lustre/obdclass/llog_test
 if [ -e ${llog_base}.ko ]; then
@@ -139,7 +130,6 @@ 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}
-%endif
 
 cat >lustre.files <<EOF
 %attr(-, root, root) /sbin/mount.lustre
@@ -202,18 +192,14 @@ popd >/dev/null
 %files modules -f lustre-modules.files
 %attr(-, root, root) %doc COPYING
 
-%if ! %{is_client}
 %files source
 %attr(-, root, root) /usr/src/lustre-%{version}
-%endif
 
 # uncomment these lines to enable deps packages
 # %files deps-sles
 # %files deps-rhel
 
-%if ! %{is_client}
 %files tests -f lustre-tests.files
-%endif
 
 %post modules
 if [ -f /boot/System.map-%{kversion} ]; then
@@ -258,7 +244,6 @@ else
        depmod -ae %{kversion} || exit 0
 fi
 
-%if ! %{is_client}
 %post tests
 if [ -f /boot/System.map-%{kversion} ]; then
        depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
@@ -272,7 +257,6 @@ if [ -f /boot/System.map-%{kversion} ]; then
 else
        depmod -ae %{kversion} || exit 0
 fi
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT