From 438a7a9d6319205709cea91a1d42586d5c2fc6cd170cc56f0b5aa1654a3b7643 Mon Sep 17 00:00:00 2001
From: Jeff Kowalczyk <jkowalczyk@suse.com>
Date: Mon, 22 Aug 2022 23:37:48 +0000
Subject: [PATCH] Accepting request 998731 from
 home:jfkw:branches:devel:languages:go

- Define go_bootstrap_version go1.16 without suse_version checks
- Simplify conditional gcc_go_version 12 on Tumbleweed, 11 elsewhere

OBS-URL: https://build.opensuse.org/request/show/998731
OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/go1.17?expand=0&rev=35
---
 go1.17.changes |  6 ++++++
 go1.17.spec    | 20 +++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/go1.17.changes b/go1.17.changes
index 6b9d840..ee2952b 100644
--- a/go1.17.changes
+++ b/go1.17.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 22 20:44:19 UTC 2022 - Jeff Kowalczyk <jkowalczyk@suse.com>
+
+- Define go_bootstrap_version go1.16 without suse_version checks
+- Simplify conditional gcc_go_version 12 on Tumbleweed, 11 elsewhere
+
 -------------------------------------------------------------------
 Thu Aug 18 08:36:32 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/go1.17.spec b/go1.17.spec
index 0fb17d7..88b30b9 100644
--- a/go1.17.spec
+++ b/go1.17.spec
@@ -24,25 +24,23 @@
 %undefine _build_create_debug
 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true NO_BRP_AR=true
 
-%if 0%{?suse_version} == 1315
-%define gcc_go_version 11
-%define go_bootstrap_version go1.4
-%else
+# Used to bootstrap go toolchain with specific existing package
 %define go_bootstrap_version go1.16
-%if 0%{?sle_version} == 150000
-# SLE15 or Leap 15.x
-%define gcc_go_version 11
-%else
+
+# Used to bootstrap go toolchain using specific version of gcc-go
+%if 0%{?suse_version} > 1500
+# openSUSE Tumbleweed
 %define gcc_go_version 12
-%endif
+%else
+%define gcc_go_version 11
 %endif
 
 # Bootstrap go toolchain using existing go package go_bootstrap_version
 # To bootstrap using gccgo use '--with gccgo'
 %bcond_with gccgo
 
-# The fallback bootstrap method via go1.4 doesn't work
-# for aarch64 nor ppc64le because go 1.4 did not support that architecture.
+# Boostrapping using existing go package can fail on certain SLE-12 architectures
+# Override here as needed
 %if 0%{?suse_version} == 1315
 %ifarch aarch64 ppc64le ppc64 s390x
 %bcond_without gccgo