From abc58e4280f5dc5c37634394684b4f8c13d87d763a566e845c928556c763674f Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.com>
Date: Thu, 17 Jun 2021 11:22:20 +0000
Subject: [PATCH] - Fix Leap 15.3 s390x gdb:testsuite build, by not requiring
 32-bit   packages for openSUSE s390x.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=285
---
 gdb.changes |  6 ++++++
 gdb.spec    | 23 ++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gdb.changes b/gdb.changes
index 7a81d11..4694637 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 17 11:19:14 UTC 2021 - Tom de Vries <tdevries@suse.com>
+
+- Fix Leap 15.3 s390x gdb:testsuite build, by not requiring 32-bit
+  packages for openSUSE s390x.
+
 -------------------------------------------------------------------
 Thu Jun 17 10:18:44 UTC 2021 - Tom de Vries <tdevries@suse.com>
 
diff --git a/gdb.spec b/gdb.spec
index 0c88cc3..2d44ad8 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -445,16 +445,6 @@ BuildRequires:  babeltrace-devel
 %endif #!s390x
 %endif #!el5
 
-%ifarch s390x
-%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
-%define leap_15_3_s390x 1
-%else
-%define leap_15_3_s390x 0
-%endif
-%else
-%define leap_15_3_s390x 0
-%endif
-
 BuildRequires:  dejagnu
 BuildRequires:  sharutils
 # gcc-objc++ is not covered by the GDB testsuite.
@@ -466,17 +456,24 @@ BuildRequires:  %{gcc}-objc
 %ifarch %ada_arch
 BuildRequires:  %{gcc}-ada
 %endif
-%if 0%{!?disable_32bit:1}
+
+%if 0%{?is_opensuse}
 # openSUSE for s390x doesn't build 32bit libs
+%define supported_32bit_arch x86_64 ppc64
+%else
+%define supported_32bit_arch x86_64 ppc64 s390x
+%endif
+
+%if 0%{!?disable_32bit:1}
 %if 0%{suse_version} > 1110
-%ifarch x86_64 ppc64 s390x
+%ifarch %{supported_32bit_arch}
 %if 0%{suse_version} >= 1330
 # Older distros miss this pseudo package, the Ada
 # testsuite won't work completely
 BuildRequires:  %{gcc}-ada-32bit
 %endif
 BuildRequires:  %{gcc}-c++-32bit
-%if 0%{suse_version} >= 1210 && 0%{suse_version} != 1315 && %{leap_15_3_s390x} == 0
+%if 0%{suse_version} >= 1210 && 0%{suse_version} != 1315
 # glibc-devel-static-32bit is (currently?) unavailable for Leap 15.3/s390x.
 BuildRequires:  glibc-devel-static-32bit
 %endif