X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre.spec.in;h=f23dca20bc033fb36f5ee7a8503ac9d14476c8ac;hb=4b0f0164c6ed761897409186376e9edc989323c9;hp=80c5f3343e340f97124c41c7ca86e5d0c33037a0;hpb=6f0fcc289887737f45687b5f8a15835aeab32ef4;p=fs%2Flustre-release.git

diff --git a/lustre.spec.in b/lustre.spec.in
index 80c5f33..f23dca2 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -146,20 +146,30 @@ BuildRoot: %{_tmppath}/lustre-%{version}-root
 Requires: %{requires_kmod_name} = %{requires_kmod_version} zlib
 Requires: %{requires_yaml_name}
 BuildRequires: libtool libyaml-devel zlib-devel
+%if %{_vendor}=="redhat"
+BuildRequires: pkgconfig
+%else
+BuildRequires: pkg-config
+%endif
 %if %{with servers}
 Requires: lustre-osd
 Requires: lustre-osd-mount
 Obsoletes: lustre-client < %{version}
 Provides: lustre-client = %{version}-%{release}
 %endif
-# GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10
+# GSS requires this: BuildRequires: libgssapi-devel >= 0.10
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 #suse don't support selinux
 BuildRequires: libselinux-devel
 Requires: libselinux
 %endif
 %if %{with lustre_modules}
+
+%if 0%{?rhel} >= 8 && %{undefined kernel_module_package_buildreqs}
+BuildRequires: redhat-rpm-config kernel-rpm-macros elfutils-libelf-devel kmod
+%else
 BuildRequires: %kernel_module_package_buildreqs
+%endif
 %if %{_vendor}=="redhat"
 BuildRequires: redhat-rpm-config
 %endif
@@ -478,6 +488,11 @@ echo '%{_bindir}/mcreate' >>lustre-tests.files
 echo '%{_bindir}/munlink' >>lustre-tests.files
 echo '%{_sbindir}/wirecheck' >>lustre-tests.files
 echo '%{_sbindir}/wiretest' >>lustre-tests.files
+%if %{_vendor}=="redhat"
+if [ -n "@MPI_BIN@" ]; then
+	echo '@MPI_BIN@/*' >>lustre-tests.files
+fi
+%endif
 %endif
 
 %files -f lustre.files
@@ -504,6 +519,7 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %{_bindir}/lfs
 %{_bindir}/lfs_migrate
 /sbin/mount.lustre
+/sbin/mount.lustre_tgt
 %if %{with static}
 %{_libdir}/liblustreapi.a
 %endif
@@ -514,6 +530,7 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %{_mandir}/man?/*
 %endif
 %{_datadir}/lustre
+%{_datadir}/bash-completion/completions/*
 %{_includedir}/lustre
 %{_includedir}/linux/lnet
 %{_includedir}/linux/lustre