rpm/slurm
SHA256
1
0
Fork 0
forked from pool/slurm
Code Pull Requests Activity

Accepting request 819285 from network:cluster

Browse Source 
- Add support for openPMIx also for Leap/SLE 15.0/1 (bsc#1173805).
- Do not run %check on SLE-12-SP2: Some incompatibility in tcl
  makes this fail.
- Remove unneeded build dependency to postgresql-devel.
- Disable build on s390 (requires 64bit).

OBS-URL: https://build.opensuse.org/request/show/819285
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slurm?expand=0&rev=47
This commit is contained in:
Dominique Leuenberger 2020-07-08 17:16:29 +00:00 committed by Git OBS Bridge
commit b0358c26fb
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slurm.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Jul 7 09:05:40 UTC 2020 - Egbert Eich <eich@suse.com>
- Add support for openPMIx also for Leap/SLE 15.0/1 (bsc#1173805).
- Do not run %check on SLE-12-SP2: Some incompatibility in tcl
makes this fail.
- Remove unneeded build dependency to postgresql-devel.
- Disable build on s390 (requires 64bit).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 3 11:11:11 UTC 2020 - Egbert Eich <eich@suse.com> Wed Jun 3 11:11:11 UTC 2020 - Egbert Eich <eich@suse.com>

10
slurm.spec
View File

@ -28,12 +28,13 @@
%define pname slurm %define pname slurm
%ifarch i586 %arm %ifarch i586 %arm s390
ExclusiveArch: do_not_build ExclusiveArch: do_not_build
%endif %endif
%if 0%{?sle_version} == 120200 %if 0%{?sle_version} == 120200
%define base_ver 1702 %define base_ver 1702
%define nocheck 1
%endif %endif
%if 0%{?sle_version} == 150000 %if 0%{?sle_version} == 150000
%define base_ver 1711 %define base_ver 1711
@ -49,8 +50,8 @@ ExclusiveArch: do_not_build
%define upgrade 1 %define upgrade 1
%endif %endif
# Build with PMIx only for SLE >= 15.2 and TW # Build with PMIx only for SLE >= 15.0 and TW
%if 0%{?sle_version} >= 150200 || 0%{suse_version} >= 1550 %if 0%{?sle_version} >= 150000 || 0%{suse_version} >= 1550
%{bcond_without pmix} %{bcond_without pmix}
%else %else
%{bcond_with pmix} %{bcond_with pmix}
@ -153,7 +154,6 @@ BuildRequires: ncurses-devel
%{?with_pmix:BuildRequires: pmix-devel} %{?with_pmix:BuildRequires: pmix-devel}
BuildRequires: openssl-devel >= 0.9.6 BuildRequires: openssl-devel >= 0.9.6
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: postgresql-devel >= 8.0.0
BuildRequires: readline-devel BuildRequires: readline-devel
%if 0%{?suse_version} > 1310 || 0%{?sle_version} %if 0%{?suse_version} > 1310 || 0%{?sle_version}
%if 0%{?sle_version} >= 120400 && 0%{?sle_version} < 150000 %if 0%{?sle_version} >= 120400 && 0%{?sle_version} < 150000
@ -724,7 +724,7 @@ rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.*
%endif %endif
%check %check
make check %{!?nocheck:make check}
%define fixperm() [ $1 -eq 1 -a -e %2 ] && /bin/chmod %1 %2 %define fixperm() [ $1 -eq 1 -a -e %2 ] && /bin/chmod %1 %2