From f9ed9e7315771003b8f3b8db0cd117d335d16511 Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Mon, 15 Feb 2021 22:31:54 +0100
Subject: [PATCH] Align spec syntax with upstream spec file

---
 environment-modules.spec | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/environment-modules.spec b/environment-modules.spec
index ebc4d3b..181db6d 100644
--- a/environment-modules.spec
+++ b/environment-modules.spec
@@ -10,15 +10,29 @@ License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
 
+BuildRequires:  dejagnu
+BuildRequires:  make
+BuildRequires:  sed
+BuildRequires:  less
+BuildRequires:  hostname
+BuildRequires:  procps
+BuildRequires:  man
+# specific requirements to build compat version and extension library
 BuildRequires:  gcc
-BuildRequires:  tcl-devel, tclx-devel, libX11-devel
-BuildRequires:  dejagnu, sed, procps, hostname, man, less
-BuildRequires: make
-Requires:       tcl, sed, procps, man, less
+BuildRequires:  tcl-devel
+# specific requirements to build compat version
+BuildRequires:  libX11-devel
+BuildRequires:  tclx-devel
+Requires:       tcl
+Requires:       sed
+Requires:       less
 Requires:       vim-filesystem
+Requires:       procps
+Requires:       man
+Requires(post): coreutils
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
-Provides:	environment(modules)
+Provides:       environment(modules)
 
 %description
 The Environment Modules package provides for the dynamic modification of
@@ -76,6 +90,7 @@ This package provides Environment Modules compatibility version (3.2).
            --with-initconf-in=etcdir \
            --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
            --with-quarantine-vars='LD_LIBRARY_PATH LD_PRELOAD'
+
 %make_build
 
 
@@ -87,7 +102,7 @@ mkdir -p %{buildroot}%{_datadir}/modulefiles
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 mkdir -p %{buildroot}%{_bindir}
 
-# Set up for alternatives.
+# setup for alternatives
 touch %{buildroot}%{_sysconfdir}/profile.d/modules.{csh,sh}
 touch %{buildroot}%{_bindir}/modulecmd
 # remove modulecmd wrapper as it will be handled by alternatives
@@ -95,10 +110,10 @@ rm -f %{buildroot}%{_datadir}/Modules/bin/modulecmd
 mv %{buildroot}%{_mandir}/man1/module{,-c}.1
 mv %{buildroot}%{_mandir}/man4/modulefile{,-c}.4
 
-# Major utilities go to regular bin dir.
+# major utilities go to regular bin dir
 mv %{buildroot}%{_datadir}/Modules/bin/envml %{buildroot}%{_bindir}/
 
-# Rename compat docs to find them in files section.
+# rename compat docs to find them in files section
 mv compat/ChangeLog ChangeLog-compat
 mv compat/NEWS NEWS-compat
 
@@ -111,11 +126,14 @@ rm -f %{buildroot}%{_docdir}/%{name}/{COPYING.GPLv2,ChangeLog-compat,INSTALL{,-w
 
 cp -p script/createmodule.sh %{buildroot}%{_datadir}/Modules/bin
 
+# install the rpm config file
 install -Dpm 644 contrib/rpm/macros.%{name} %{buildroot}/%{macrosdir}/macros.%{name}
 
+
 %check
 make test
 
+
 %post
 # Cleanup from pre-alternatives
 [ ! -L %{_mandir}/man1/module.1.gz ] && rm -f %{_mandir}/man1/module.1.gz