From 4b04d886974e445a65506693c4d3b3aea4b1a26328d3cb6474a9c037b981dbe7 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Tue, 7 Jul 2020 13:08:10 +0000
Subject: [PATCH 1/3] Accepting request 819233 from
 home:eeich:branches:network:cluster

- Add support for openPMIx also for Leap/SLE 15.0/1.
- Do not run %check on SLE-12-SP2: Some incompatibility in tcl
  makes this fail.
- Remove unneeded build dependency to postgresql-devel.

OBS-URL: https://build.opensuse.org/request/show/819233
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=152
---
 slurm.changes | 8 ++++++++
 slurm.spec    | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/slurm.changes b/slurm.changes
index 1f5c813..eddd287 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul  7 09:05:40 UTC 2020 - Egbert Eich <eich@suse.com>
+
+- Add support for openPMIx also for Leap/SLE 15.0/1.
+- Do not run %check on SLE-12-SP2: Some incompatibility in tcl
+  makes this fail.
+- Remove unneeded build dependency to postgresql-devel.
+
 -------------------------------------------------------------------
 Wed Jun  3 11:11:11 UTC 2020 - Egbert Eich <eich@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 44b3b9f..f743048 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -34,6 +34,7 @@ ExclusiveArch:  do_not_build
 
 %if 0%{?sle_version} == 120200
 %define base_ver 1702
+%define nocheck 1
 %endif
 %if 0%{?sle_version} == 150000
 %define base_ver 1711
@@ -49,8 +50,8 @@ ExclusiveArch:  do_not_build
 %define upgrade 1
 %endif
 
-# Build with PMIx only for SLE >= 15.2 and TW
-%if 0%{?sle_version} >= 150200 || 0%{suse_version} >= 1550
+# Build with PMIx only for SLE >= 15.0 and TW
+%if 0%{?sle_version} >= 150000 || 0%{suse_version} >= 1550
 %{bcond_without pmix}
 %else
 %{bcond_with pmix}
@@ -153,7 +154,6 @@ BuildRequires:  ncurses-devel
 %{?with_pmix:BuildRequires:  pmix-devel}
 BuildRequires:  openssl-devel >= 0.9.6
 BuildRequires:  pkgconfig
-BuildRequires:  postgresql-devel >= 8.0.0
 BuildRequires:  readline-devel
 %if 0%{?suse_version} > 1310 || 0%{?sle_version}
  %if 0%{?sle_version} >= 120400 && 0%{?sle_version} < 150000
@@ -724,7 +724,7 @@ rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.*
 %endif
 
 %check
-make check
+%{!?nocheck:make check}
 
 %define fixperm() [ $1 -eq 1 -a -e %2 ] && /bin/chmod %1 %2
 

From 361d99b1111d4cdbc4ca98fe0eace406f621f5a7c14b947ef7d462dc6bf86862 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Tue, 7 Jul 2020 16:20:06 +0000
Subject: [PATCH 2/3] - Add support for openPMIx also for Leap/SLE 15.0/1
 (bsc#1173805).

OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=153
---
 slurm.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slurm.changes b/slurm.changes
index eddd287..2a51996 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Tue Jul  7 09:05:40 UTC 2020 - Egbert Eich <eich@suse.com>
 
-- Add support for openPMIx also for Leap/SLE 15.0/1.
+- 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.

From e3512185d84652e6bfb4ac60d91d6de5bc8c1875f9bbcbeb6fe198575c8f4c42 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Tue, 7 Jul 2020 20:14:00 +0000
Subject: [PATCH 3/3] - Disable build on s390 (requires 64bit).

OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=154
---
 slurm.changes | 1 +
 slurm.spec    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/slurm.changes b/slurm.changes
index 2a51996..ff93452 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -5,6 +5,7 @@ Tue Jul  7 09:05:40 UTC 2020 - Egbert Eich <eich@suse.com>
 - 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>
diff --git a/slurm.spec b/slurm.spec
index f743048..5818ebc 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -28,7 +28,7 @@
 
 %define pname slurm
 
-%ifarch i586 %arm
+%ifarch i586 %arm s390
 ExclusiveArch:  do_not_build
 %endif