diff --git a/.gitignore b/.gitignore index 138c231..f7e9abe 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ /go1.21rc1.src.tar.gz /go1.21rc2.src.tar.gz /go1.21rc3.src.tar.gz +/go1.21.0.src.tar.gz diff --git a/0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch b/0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch deleted file mode 100644 index 1000ad8..0000000 --- a/0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 34168586ca0af835b5e836b6fe458e2ff23a9820 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= -Date: Tue, 4 Jul 2023 18:12:14 +0200 -Subject: [PATCH] Disable Google's proxy, sumdb and toolchain - ---- - go.env | 6 +++--- - src/cmd/go/testdata/script/mod_sumdb_golang.txt | 6 +++--- - 2 files changed, 6 insertions(+), 6 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 -diff --git a/src/cmd/go/testdata/script/mod_sumdb_golang.txt b/src/cmd/go/testdata/script/mod_sumdb_golang.txt -index 8698412f78..78e8e87700 100644 ---- a/src/cmd/go/testdata/script/mod_sumdb_golang.txt -+++ b/src/cmd/go/testdata/script/mod_sumdb_golang.txt -@@ -2,12 +2,12 @@ - env GOPROXY= - env GOSUMDB= - go env GOPROXY --stdout '^https://proxy.golang.org,direct$' -+stdout '^direct$' - go env GOSUMDB --stdout '^sum.golang.org$' -+stdout '^off$' - env GOPROXY=https://proxy.golang.org - go env GOSUMDB --stdout '^sum.golang.org$' -+stdout '^off$' - - # Download direct from github. - --- -2.40.1 - diff --git a/bundled-deps.sh b/bundled-deps.sh index bdcbd30..51dd446 100755 --- a/bundled-deps.sh +++ b/bundled-deps.sh @@ -19,5 +19,4 @@ provides="" for bundle in $(find -name modules.txt); do provides="$provides\n$(cat "$bundle" | grep "^# " | grep -v "# explicit" | sed -r s/"^#.* => "// | sed -r "s/# //" | sed -r "s:(.*) v(.*):Provides\: bundled(golang(\1)) = \2:")" done -#TODO replace - with . in version per packaging guidelines -echo -e "$provides" | sort -u +echo -e "$provides" | sed 's/-/./g' | sort -u diff --git a/golang.spec b/golang.spec index 083d7cf..265e6ea 100644 --- a/golang.spec +++ b/golang.spec @@ -96,17 +96,14 @@ # Comment out go_prerelease and go_patch as needed %global go_api 1.21 -%global go_prerelease rc3 -#global go_patch 5 +#global go_prerelease rc3 +%global go_patch 0 %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} -# For rpmdev-bumpspec and releng automation -%global baserelease 2 - Name: golang -Version: 1.21.0 +Version: %{go_version} Release: %autorelease Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain @@ -133,24 +130,22 @@ BuildRequires: pcre2-devel, glibc-static, perl-interpreter, procps-ng Provides: go = %{version}-%{release} # Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data -# - in version filed substituted with . per versioning guidelines Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20221118152302.e6195bd50e26 Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20220319035150.800ac71e25c2 -Provides: bundled(golang(golang.org/x/arch)) = 0.3.0 -Provides: bundled(golang(golang.org/x/crypto)) = 0.10.0 -Provides: bundled(golang(golang.org/x/mod)) = 0.10.1.0.20230606122920.62c7e578f1a7 -Provides: bundled(golang(golang.org/x/net)) = 0.11.1.0.20230613203745.f5464ddb689c -Provides: bundled(golang(golang.org/x/sync)) = 0.2.1.0.20230601203510.93782cc822b6 -Provides: bundled(golang(golang.org/x/sys)) = 0.9.0 -Provides: bundled(golang(golang.org/x/term)) = 0.9.0 -Provides: bundled(golang(golang.org/x/text)) = 0.10.1.0.20230613190012.2df65d769a9e -Provides: bundled(golang(golang.org/x/tools)) = 0.9.4.0.20230613194514.c6c98305492 +Provides: bundled(golang(golang.org/x/arch)) = 0.4.0 +Provides: bundled(golang(golang.org/x/crypto)) = 0.11.1.0.20230711161743.2e82bdd1719d +Provides: bundled(golang(golang.org/x/mod)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net)) = 0.12.1.0.20230712162946.57553cbff163 +Provides: bundled(golang(golang.org/x/sync)) = 0.3.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.10.0 +Provides: bundled(golang(golang.org/x/term)) = 0.10.0 +Provides: bundled(golang(golang.org/x/text)) = 0.11.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.11.1.0.20230712164437.1ca21856af7b Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-src = %{version}-%{release} Requires: go-filesystem -Patch1: 0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch Patch4: 0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch # Having documentation separate was broken diff --git a/sources b/sources index 5bc3e8b..37ccc63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.21rc3.src.tar.gz) = 2465abe1fab0039e10a586b4d53347ac8177e615d936b3de0fdd2dd13cf7a622e25bb5769c7f80e21154863898c1afc1b563bebb253f9ca538f3be7face9fe76 +SHA512 (go1.21.0.src.tar.gz) = da629fee156de6abbc5195f746e2fe4172a31b97eccd3871283c60452e81ac740533cc28ca68762ebc0ce48fb791dc527d3b7ebe7e1aee0f0b68868de736ed42