%if %{with lustre_utils}
%package osd-ldiskfs-mount
Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso.
-BuildRequires: e2fsprogs-devel >= 1.44.3
-Requires: ldiskfsprogs > 1.45.6
+BuildRequires: e2fsprogs-devel >= 1.44.3 libmount-devel
+Requires: ldiskfsprogs > 1.45.6 libmount
Provides: lustre-osd-mount = %{version}
Provides: %{name}-osd-mount = %{version}
Obsoletes: %{name}-osd-mount < %{version}
%if %{with lustre_utils}
%package osd-zfs-mount
Summary: osd-zfs-mount contains mount's zfs specific dso.
+BuildRequires: libmount-devel
+Requires: libmount
Provides: %{name}-osd-mount = %{version}
Obsoletes: lustre-osd-mount < %{version}
# Tests also require zpool from zfs package:
%else
BuildRequires: openmpi2-devel
%endif
-%endif # openmpi
-%endif # mpi
+# openmpi
+%endif
+# mpi
+%endif
%description tests
This package contains a set of test binaries and scripts that are intended
%endif
%if %{with mpi}
-%if %{mpi_name} == "mpich"
+%if "%{mpi_name}" == "mpich"
%{?_mpich_load}
%endif
-%if %{mpi_name} == "openmpi"
+%if "%{mpi_name}" == "openmpi"
%{?_openmpi_load}
%endif
-%endif # mpi
+# mpi
+%endif
%if %{with mofed}
o2ib_path=$(find /usr/src/ofa_kernel/ -type d -name ofed_scripts | xargs dirname)
make %{?_smp_mflags} -s %{?make_args}
%if %{with mpi}
-%if %{mpi_name} == "mpich"
+%if "%{mpi_name}" == "mpich"
%{?_mpich_unload}
%endif
-%if %{mpi_name} == "openmpi"
+%if "%{mpi_name}" == "openmpi"
%{?_openmpi_unload}
%endif
-%endif # mpi
+# mpi
+%endif
%install
%if %{with mpi}
-%if %{mpi_name} == "mpich"
+%if "%{mpi_name}" == "mpich"
%{?_mpich_load}
%endif
-%if %{mpi_name} == "openmpi"
+%if "%{mpi_name}" == "openmpi"
%{?_openmpi_load}
%endif
-%endif # mpi
+# mpi
+%endif
make install DESTDIR=$RPM_BUILD_ROOT
%if %{with lustre_tests}
:> lustre-tests.files
%if %{with mpi}
-%if %{mpi_name} == "mpich"
+%if "%{mpi_name}" == "mpich"
%{?_mpich_load}
%endif
-%if %{mpi_name} == "openmpi"
+%if "%{mpi_name}" == "openmpi"
%{?_openmpi_load}
%endif
-%endif # mpi
+# mpi
+%endif
echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files
echo '%{_bindir}/mcreate' >>lustre-tests.files
echo '%{_bindir}/munlink' >>lustre-tests.files