From 6bb7ae61c4f12fb4043e95ffa5ecca53ab7813ab Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 15 Dec 2020 11:06:19 -0500
Subject: [PATCH] import golang-1.14.12-1.module+el8.3.0+8784+380394dc

---
 .gitignore        |  2 +-
 .golang.metadata  |  2 +-
 SPECS/golang.spec | 26 ++++++++++++++++----------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index daed2c4..64af3be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/go-go-1.14.7-2-openssl-fips.tar.gz
+SOURCES/go-go-1.14.12-1-openssl-fips.tar.gz
diff --git a/.golang.metadata b/.golang.metadata
index 26fb63d..cd050e1 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1 +1 @@
-c8bffb54b2928e9d95eab76e148cdebd6dc88701 SOURCES/go-go-1.14.7-2-openssl-fips.tar.gz
+92e0ddaaba022868005061bccaa42290daf354e1 SOURCES/go-go-1.14.12-1-openssl-fips.tar.gz
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index 53a6a4b..fb4b45e 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -96,12 +96,12 @@
 %endif
 
 %global go_api 1.14
-%global go_version 1.14.7
-%global pkg_release 2
+%global go_version 1.14.12
+%global pkg_release 1
 
 Name:           golang
 Version:        %{go_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -139,11 +139,6 @@ Patch215:       ./go1.5-zoneinfo_testing_only.patch
 # Proposed patch by jcajka https://golang.org/cl/86541
 Patch221: fix_TestScript_list_std.patch
 
-# It seems this patch will be included in Go 1.14.5
-# https://github.com/golang/go/issues/39991
-# https://go-review.googlesource.com/c/go/+/240917
-#Patch240917: ppc64le_fix_missing_deferreturn.patch
-
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
 
@@ -237,8 +232,6 @@ Requires:       %{name} = %{version}-%{release}
 
 %patch221 -p1
 
-#%patch240917 -p1
-
 cp %{SOURCE1} ./src/runtime/
 
 %build
@@ -505,6 +498,19 @@ cd ..
 %endif
 
 %changelog
+* Tue Nov 17 2020 David Benoit <dbenoit@redhat.com> - 1.14.12-1
+- Rebase to 1.14.12
+- Resolves: rhbz#1898829
+- Resolves: rhbz#1898832
+- Resolves: rhbz#1898834
+
+* Thu Nov 12 2020 Alejandro Sáez <asm@redhat.com> - 1.14.10-1
+- Rebase to 1.14.10
+- Remove patch to fix missing deferreturn on linux/ppc64le rhbz#1854836
+- Resolves: rhbz#1897181
+- Resolves: rhbz#1897182
+- Resolves: rhbz#1897185
+
 * Thu Aug 27 2020 Alejandro Sáez <asm@redhat.com> - 1.14.7-2
 - Improve test suit
 - Resolves: rhbz#1854693