LU-12214 build: fix make rpms

Disable an mpi tests if host don't have any MPI implementation
installed.

libselinux should a soft dependence and rpm able to handle it
internally,

Change-Id: I09eaa825a086dd349699de287222e8dc14d1fd1a
Signed-off-by: Alexey Lyashkov <c17817@cray.com>
Reviewed-on: https://review.whamcloud.com/37954
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Shuichi Ihara <sihara@ddn.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 4f3ac4f..ed23616 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -576,6 +576,9 @@ fi
 if test x$enable_static != xyes ; then
        RPMBINARGS="$RPMBINARGS --without static"
 fi
 if test x$enable_static != xyes ; then
        RPMBINARGS="$RPMBINARGS --without static"
 fi

+if test x$enable_mpitests != xyes ; then
+       RPMBINARGS="$RPMBINARGS --without mpi"
+fi

 
 RPMBUILD_BINARY_ARGS=$RPMBINARGS
 
 
 RPMBUILD_BINARY_ARGS=$RPMBINARGS
 

diff --git a/lustre.spec.in b/lustre.spec.in
index 8869a50..246122a 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -184,7 +184,6 @@ Provides: lustre-client = %{version}-%{release}
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 #suse don't support selinux
 BuildRequires: libselinux-devel
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 #suse don't support selinux
 BuildRequires: libselinux-devel

-Requires: libselinux

 %endif
 %if %{with lustre_modules}
 %if %{with mofed}
 %endif
 %if %{with lustre_modules}
 %if %{with mofed}