From 1173b391dcadc987bd7349a2fffe4b1f5d4925ed Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Jul 02 2019 06:18:07 +0000 Subject: Do not install slurm implementation of libpmi/pmi2 libraries in favor of the faster implementation provided by pmix Remove pmi environment module formerly used to select the slurm vs pmix implementations of libpmi/pmi2 --- diff --git a/slurm.spec b/slurm.spec index 50cb3d7..af321c4 100644 --- a/slurm.spec +++ b/slurm.spec @@ -12,7 +12,7 @@ Name: slurm Version: 19.05.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -41,7 +41,6 @@ Patch22: slurm_to_python3.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: environment(modules) BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: perl-devel @@ -117,8 +116,6 @@ and their respective man pages. %package libs Summary: Slurm shared libraries -Provides: pmi -Requires: environment(modules) %description libs Slurm shared libraries. @@ -259,11 +256,11 @@ s|^dir_tmpfiles_d=.*|dir_tmpfiles_d="%{_tmpfilesdir}"|g;' \ extras/%{name}-setuser.in > extras/%{name}-setuser # build base packages -%make_build V=1 +%make_build # build contribs packages # INSTALLDIRS=vendor so perlapi goes to vendor_perl directory -%make_build PERL_MM_PARAMS="INSTALLDIRS=vendor" contrib V=1 +%make_build PERL_MM_PARAMS="INSTALLDIRS=vendor" contrib %check # The test binaries need LD_LIBRARY_PATH to find the compiled slurm library @@ -321,18 +318,6 @@ touch %{buildroot}%{_rundir}/%{name}/slurmctld.pid touch %{buildroot}%{_rundir}/%{name}/slurmd.pid touch %{buildroot}%{_rundir}/%{name}/slurmdbd.pid -# install pmi/slurm environment module file -install -d -m 0755 %{buildroot}%{_modulesdir}/pmi -cat >%{buildroot}%{_modulesdir}/pmi/%{name}-%{_arch} <%{buildroot}%{_libdir}/pkgconfig/%{name}.pc <%{buildroot}%{_libdir}/%{name}/lib/pkgconfig/pmi.pc <%{buildroot}%{_libdir}/%{name}/lib/pkgconfig/pmi2.pc < - 19.05.0-5 +- Do not install slurm implementation of libpmi/pmi2 libraries +- in favor of the faster implementation provided by pmix +- Remove pmi environment module formerly used to select the slurm +- vs pmix implementations of libpmi/pmi2 + * Wed Jun 19 2019 Philip Kovacs - 19.05.0-4 - Correct the configure for pmix - Correct the slurm_pmix_soname patch