From ad89bc0c72f54c269094a68d28b73fd641b29ca4 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Mon, 23 Oct 2023 10:39:52 +0200
Subject: [PATCH 1/3] disable 32bit build on ALP

---
 _config | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/_config b/_config
index b391025..d10b2b0 100644
--- a/_config
+++ b/_config
@@ -1834,12 +1834,34 @@ Optflags: * -O2 -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -fstack-protector-st
 %define skelcd_compat 0
 %define _without_aom 1
 %define _without_avif 1
+%define disable_32bit 1
+
+%ifarch s390x
+%define tuneflag zEC12
+%define archflag zEC12
+
+Macros:
+%tuneflag zEC12
+%archflag zEC12
+:Macros
+%endif
+
+Substitute: glibc-devel-32bit
+Substitute: glibc-devel-static-32bit
+Substitute: gcc-32bit
+Substitute: gcc5-32bit
+Substitute: gcc6-32bit
+Substitute: gcc-ada-32bit
+Substitute: gcc5-c++-32bit
+Substitute: gcc6-c++-32bit
+Substitute: gcc-c++-32bit
 
 Macros:
 %suse_version 1600
 %workbench_version 0100
 %is_opensuse 0
 %skelcd_compat 0
+%disable_32bit 1
 %_without_aom 1
 %_without_avif 1
 %build_ldflags %{?_lto_cflags}
@@ -1923,31 +1945,6 @@ Macros:
 # Support: !rpmlint-Factory
 # Support: !rpmlint-Factory-strict
 
-
-
-# copy-paste from openSUSE:Factory:zSystems
-%ifarch s390x
-%define disable_32bit 1
-%define tuneflag zEC12
-%define archflag zEC12
-
-Macros:
-%disable_32bit 1
-%tuneflag zEC12
-%archflag zEC12
-:Macros
-
-Substitute: glibc-devel-32bit
-Substitute: glibc-devel-static-32bit
-Substitute: gcc-32bit
-Substitute: gcc5-32bit
-Substitute: gcc6-32bit
-Substitute: gcc-ada-32bit
-Substitute: gcc5-c++-32bit
-Substitute: gcc6-c++-32bit
-Substitute: gcc-c++-32bit
-%endif
-
 Substitute: mail
 
 %if 1

From 7dae03eb4d208d22bbb33b240bdce20b6b2213d0 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Mon, 23 Oct 2023 10:40:06 +0200
Subject: [PATCH 2/3] cleanup for Workbench

---
 _config | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/_config b/_config
index d10b2b0..6dad2a3 100644
--- a/_config
+++ b/_config
@@ -1947,7 +1947,6 @@ Macros:
 
 Substitute: mail
 
-%if 1
 %if "%_project" == "SUSE:ALP:Workbench:1.0"
 %if "%_repository" == "standard"
 %ifarch riscv64
@@ -1973,6 +1972,5 @@ ExportFilter: ^(kernel-obs-build|qemu-linux-user).*\.riscv64\.rpm$
 ExportFilter: ^qemu-linux-user-riscv.*\.riscv64\.rpm$ .
 
 %endif # %qemu_user_space_build
-%endif # SUSE:ALP
-%endif # 1
+%endif # SUSE:ALP:Workbench:1.0
 

From 5fc855ab709b1ec4216e03d5bd4a0cf39dcce0d8 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Mon, 23 Oct 2023 10:45:17 +0200
Subject: [PATCH 3/3] temporary build-disable python-redis until it is fixed

---
 _config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/_config b/_config
index 6dad2a3..1f31906 100644
--- a/_config
+++ b/_config
@@ -105,6 +105,8 @@ BuildFlags: excludebuild:python-isort:test
 BuildFlags: excludebuild:virt-manager:test
 BuildFlags: excludebuild:python-pandas:test-py311
 
+# temporary disable to allow staging to work properly, will remove once fixed sr are done
+BuildFlags: excludebuild:python-redis
 
 # no 32bit on ALP
 BuildFlags: excludebuild:rpmlint:test