From 0015ada4914714df6bf3d9f20e70759978295241 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Mar 04 2018 01:52:28 +0000 Subject: Release of 17.11.4 Add perl-devel, python3 to build requirements Add patch to convert python references to python3 Use LDFLAGS to disable -z now instaed of _hardened_ldflags --- diff --git a/slurm.abignore b/slurm.abignore new file mode 100644 index 0000000..db5034b --- /dev/null +++ b/slurm.abignore @@ -0,0 +1,10 @@ +[suppress_file] +# suppress abi check for anything not in /usr/lib or /usr/lib64 +filename_not_regexp = (/usr/lib/.*|/usr/lib64/.*) + +# suppress abi check for the slurm plugins +filename_regexp = (/usr/lib/slurm/.*|/usr/lib64/slurm/.*) + +[suppress_type] +# suppress abi check for the slurm internal library +soname_regexp = libslurmfull* diff --git a/slurm.spec b/slurm.spec index d1e8a1f..bd40545 100644 --- a/slurm.spec +++ b/slurm.spec @@ -2,7 +2,7 @@ %global obs_evr 17.02.9-4 # Upstream tarballs use an additional release number -%global ups_rel 2 +%global ups_rel 1 %if "%{ups_rel}" == "1" %global name_version %{name}-%{version} @@ -13,12 +13,9 @@ # Allow linkage with undefined symbols (disable -z,defs) %undefine _strict_symbol_defs_build -# Allow dlopen with unresolved symbols (disable -z,now) -%define _hardened_ldflags "-Wl,-z,lazy" - Name: slurm -Version: 17.11.3 -Release: 3%{?dist} +Version: 17.11.4 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -40,18 +37,21 @@ Patch12: slurm_doc_fix.patch # Fedora-related patches Patch20: slurm_pmix_soname.patch Patch21: slurm_service_files.patch +Patch22: slurm_to_python3.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: environment(modules) BuildRequires: desktop-file-utils BuildRequires: gcc +BuildRequires: perl-devel BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-interpreter BuildRequires: perl-podlators BuildRequires: pkgconf BuildRequires: pkgconfig(check) %{?systemd_requires} +BuildRequires: python3 BuildRequires: systemd BuildRequires: hdf5-devel @@ -207,6 +207,7 @@ Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm. %patch12 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 cp %SOURCE1 etc/slurm.conf cp %SOURCE1 etc/slurm.conf.example cp %SOURCE2 etc/slurmdbd.conf @@ -222,7 +223,9 @@ cp %SOURCE5 extras/%{name}-setuser.in %{__aclocal} -I auxdir %{__autoconf} %{__automake} --no-force +# use -z lazy to allow dlopen with unresolved symbols %configure \ + LDFLAGS="$LDFLAGS -Wl,-z,lazy" \ --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir}/%{name} \ --with-pam_dir=%{_libdir}/security \ @@ -434,8 +437,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 -%ldconfig_scriptlets -n devel -%ldconfig_scriptlets -n lib +%ldconfig_scriptlets devel +%ldconfig_scriptlets libs # ----- # Slurm @@ -730,6 +733,12 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Sat Mar 3 2018 Philip Kovacs - 17.11.4-1 +- Release of 17.11.4 +- Add perl-devel, python3 to build requirements +- Add patch to convert python references to python3 +- Use LDFLAGS to disable -z now instaed of _hardened_ldflags + * Thu Feb 15 2018 Philip Kovacs - 17.11.3-3 - Add perl-interpreter to BuildRequires diff --git a/slurm_to_python3.patch b/slurm_to_python3.patch new file mode 100644 index 0000000..fdfcbe8 --- /dev/null +++ b/slurm_to_python3.patch @@ -0,0 +1,60 @@ +diff --git a/contribs/cray/csm/slurmconfgen_smw.py b/contribs/cray/csm/slurmconfgen_smw.py +index cf2bf56f82..013181447f 100644 +--- a/contribs/cray/csm/slurmconfgen_smw.py ++++ b/contribs/cray/csm/slurmconfgen_smw.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Copyright 2015-2016 Cray Inc. All Rights Reserved. + """ A script to generate slurm.conf and gres.conf for a +diff --git a/contribs/cray/slurmconfgen.py.in b/contribs/cray/slurmconfgen.py.in +index b92aabc731..970c5b4802 100644 +--- a/contribs/cray/slurmconfgen.py.in ++++ b/contribs/cray/slurmconfgen.py.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # + # (c) Copyright 2013 Cray Inc. All Rights Reserved. + # +diff --git a/doc/html/shtml2html.py b/doc/html/shtml2html.py +index 0b03182b80..43954a37a9 100755 +--- a/doc/html/shtml2html.py ++++ b/doc/html/shtml2html.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + import re + import sys +diff --git a/doc/man/man2html.py b/doc/man/man2html.py +index 54909096b9..93433d6fa3 100755 +--- a/doc/man/man2html.py ++++ b/doc/man/man2html.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + import re + import sys +diff --git a/testsuite/expect/driveregress.py b/testsuite/expect/driveregress.py +index 8019615953..4e7eb7ca0f 100755 +--- a/testsuite/expect/driveregress.py ++++ b/testsuite/expect/driveregress.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + ############################################################################ + # Copyright (C) 2011-2013 SchedMD LLC +diff --git a/testsuite/expect/regression.py b/testsuite/expect/regression.py +index 938aecc154..ea64c7cce0 100755 +--- a/testsuite/expect/regression.py ++++ b/testsuite/expect/regression.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + ############################################################################ + # Copyright (C) 2006 The Regents of the University of California. + # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). diff --git a/sources b/sources index 66ed738..5e07f3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-17.11.3-2.tar.bz2) = 38a8edd09fe24f08e712a296a1ecb34e207daacdf0e8f57444e35d0329e6b26ecb7f34fecbcc8f46c40df37adf40a1c1d33f2bdb5c48d5882de5b8dfaf5a5b9c +SHA512 (slurm-17.11.4.tar.bz2) = 027f7dee51980f1351c56934ebdf510cf72c049544cdfbbfc450223b5e27a9d21b9f6fcf7a3a043b7cc18c913e9ce6dcd8d0153a5e7625c84cc9a67b69832962