From 091bb5a39957b17cd3ebe77314870bbcc386eab6 Mon Sep 17 00:00:00 2001
From: Jian Yu <yujian@whamcloud.com>
Date: Wed, 29 Jun 2022 14:23:59 -0700
Subject: [PATCH] LU-15521 spec: fix more bare words error with rpm 4.16

This patch fixes more bare words errors and extra tokens
warnings with rpm 4.16.

Test-Parameters: trivial

Change-Id: Ic40b5763d1cb362d5aa77b06e9a5768b2abbc708
Fixes: 597a6bf9e085 ("LU-15521 spec: fix bare words error with rpm 4.16")
Signed-off-by: Jian Yu <yujian@whamcloud.com>
---
 lustre.spec.in | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/lustre.spec.in b/lustre.spec.in
index dfbd282..3dc20c9 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -370,8 +370,10 @@ BuildRequires: openmpi-devel
 %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
@@ -488,13 +490,14 @@ fi
 %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)
@@ -539,24 +542,26 @@ fi
 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
 
@@ -668,13 +673,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/liblustreapi.la
 %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
-- 
1.8.3.1