From c3be9cc552d1d0ba063b4778939e458343344a3a Mon Sep 17 00:00:00 2001
From: David Benoit <dbenoit@redhat.com>
Date: Wed, 8 Nov 2023 11:46:42 -0500
Subject: [PATCH] Do not remove GOPROXY/GOSUMDB

Related: RHEL-12620
---
 0001-fedora-Modify-go.env.patch | 30 ------------------------------
 golang.spec                     | 10 +++++-----
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 0001-fedora-Modify-go.env.patch

diff --git a/0001-fedora-Modify-go.env.patch b/0001-fedora-Modify-go.env.patch
deleted file mode 100644
index d0b18c7..0000000
--- a/0001-fedora-Modify-go.env.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 52d9cfec8124a9c7382bed5284246d9b18a21eb4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
-Date: Wed, 16 Aug 2023 07:06:38 +0200
-Subject: [PATCH] Modify go.env
-
-Change GOPROXY, GOSUMDB, and GOTOOLCHAIN
----
- go.env | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/go.env b/go.env
-index 6ff2b921d4..087208cd7c 100644
---- a/go.env
-+++ b/go.env
-@@ -4,9 +4,9 @@
- 
- # Use the Go module mirror and checksum database by default.
- # See https://proxy.golang.org for details.
--GOPROXY=https://proxy.golang.org,direct
--GOSUMDB=sum.golang.org
-+GOPROXY=direct
-+GOSUMDB=off
- 
- # Automatically download newer toolchains as directed by go.mod files.
- # See https://go.dev/doc/toolchain for details.
--GOTOOLCHAIN=auto
-+GOTOOLCHAIN=local
--- 
-2.41.0
-
diff --git a/golang.spec b/golang.spec
index 6a4828e..eab5a91 100644
--- a/golang.spec
+++ b/golang.spec
@@ -97,7 +97,7 @@
 
 Name:           golang
 Version:        %{version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
@@ -137,8 +137,6 @@ Requires:       %{name}-src = %{version}-%{release}
 Requires:       openssl-devel
 Requires:       diffutils
 
-Patch0001: 	0001-fedora-Modify-go.env.patch
-
 # Proposed patch by jcajka https://golang.org/cl/86541
 Patch221:       fix_TestScript_list_std.patch
 
@@ -252,8 +250,6 @@ ln -s ../go-go%{version} go
 ./scripts/configure-crypto-tests.sh
 popd
 
-%patch0001 -p1
-
 %patch2 -p1
 %patch3 -p1
 
@@ -522,6 +518,10 @@ cd ..
 %endif
 
 %changelog
+* Wed Nov 08 2023 David Benoit <dbenoit@redhat.com> - 1.21.3-4
+- Do not remove GOPROXY/GOSUMDB
+- Related: RHEL-12620
+
 * Thu Nov 02 2023 David Benoit <dbenoit@redhat.com> - 1.21.3-3
 - Fix go.env in Go 1.21
 - Related: RHEL-12620