From 7245d5e8435e80bb18d340a50a1d507955b2ac26 Mon Sep 17 00:00:00 2001
From: Philip Kovacs <pkdevel@yahoo.com>
Date: Oct 05 2017 04:43:02 +0000
Subject: Added BuildRequires gcc and minor packaging conformance items.


---

diff --git a/slurm.spec b/slurm.spec
index bef8b91..2613026 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -26,7 +26,7 @@
 
 Name:           slurm
 Version:        17.02.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple Linux Utility for Resource Management
 License:        GPLv2 and BSD
 URL:            https://slurm.schedmd.com/
@@ -73,6 +73,7 @@ BuildRequires:  numactl-devel
 %endif
 
 BuildRequires:  desktop-file-utils
+BuildRequires:  gcc
 BuildRequires:  perl-ExtUtils-MakeMaker
 BuildRequires:  perl-podlators
 BuildRequires:  pkgconf
@@ -270,7 +271,7 @@ s|^dir_tmpfiles_d=.*|dir_tmpfiles_d="%{_tmpfilesdir}"|g;' \
 PERL_MM_PARAMS="INSTALLDIRS=vendor" %make_build contrib V=0
 
 %check
-make check
+%{__make} check
 
 %install
 %make_install
@@ -403,13 +404,8 @@ rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/.packlist
 rm -f %{buildroot}%{perl_vendorarch}/auto/Slurm*/Slurm*.bs
 rm -f %{buildroot}%{perl_archlib}/perllocal.pod
 
-# customize __find_requires to strip out incorrect dependencies
-cat >find-requires <<EOF
-exec %{__find_requires} "$@" | grep -v -E '^libpmix.so|libevent'
-EOF
-chmod +x find-requires
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_builddir}/%{buildsubdir}/find-requires
+# filter unneeded dependencies
+%global __requires_exclude ^libpmix.so|libevent
 
 # -----
 # Slurm
@@ -751,6 +747,9 @@ fi
 %systemd_postun_with_restart slurmdbd.service
 
 %changelog
+* Thu Oct 5 2017 Philip Kovacs <pkdevel@yahoo.com> - 17.02.7-3
+- Added BuildRequires gcc and minor packaging conformance items.
+
 * Sat Sep 16 2017 Philip Kovacs <pkdevel@yahoo.com> - 17.02.7-2
 - Removed unneeded Requires(pre).
 
diff --git a/slurm_setuser.in b/slurm_setuser.in
index 7ed78e6..ae7e6c2 100644
--- a/slurm_setuser.in
+++ b/slurm_setuser.in
@@ -50,7 +50,7 @@ function usage ()
 {
 	echo  -e "Sets the slurm installation on this node to run as the specified user and group\n"
 	echo  "Usage: $prog [-u <user>] [-g <group>] [-h] [-y]"
-	echo  "   -u user>    : the slurm file owner and SlurmUser ($user)"
+	echo  "   -u <user>   : the slurm file owner and SlurmUser ($user)"
 	echo  "   -g <group>  : the slurm file group ($group)"
 	echo  "   -y          : answer yes to all questions ($yesno)"
 	echo  "   -h          : print help"