From 4db6ed1372f1401c7b986f0c53b6d2afb5abc1bf Mon Sep 17 00:00:00 2001 From: Mike Rochefort Date: Tue, 14 Dec 2021 22:42:00 -0500 Subject: [PATCH] Update to 1.18beta1 Related: rhbz#2002859 --- ...ndled-tzdata-at-runtime-except-for-t.patch | 2 +- golang.spec | 29 +++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch index a8538b5..c0f214b 100644 --- a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch +++ b/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch @@ -29,7 +29,7 @@ index 35ce69b228..1cea04ed7e 100644 - z, err := loadLocation("America/Los_Angeles", zoneSources[len(zoneSources)-1:]) + z, err := loadLocation("America/Los_Angeles", zoneSources) if err != nil { - panic("cannot load America/Los_Angeles for testing: " + err.Error()) + panic("cannot load America/Los_Angeles for testing: " + err.Error() + "; you may want to use -tags=timetzdata") } @@ -21,8 +23,9 @@ func initTestingZone() { var OrigZoneSources = zoneSources diff --git a/golang.spec b/golang.spec index eb8645e..6b3bc28 100644 --- a/golang.spec +++ b/golang.spec @@ -105,8 +105,8 @@ %global gohostarch s390x %endif -%global go_api 1.17 -%global go_version %{go_api}.5 +%global go_api 1.18 +%global go_version %{go_api}beta1 # For rpmdev-bumpspec and releng automation %global baserelease 1 @@ -140,16 +140,17 @@ 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.20210506205249.923b5ab0fc1a -Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20200824232613.28f6c0f3b639 -Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20210502124803.cbf565b21d1e -Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0.20210503195802.e9a32991a82e -Provides: bundled(golang(golang.org/x/mod)) = 0.5.1 -Provides: bundled(golang(golang.org/x/net)) = 0.0.0.20211209100829.84cba5454caf -Provides: bundled(golang(golang.org/x/sys)) = 0.0.0.20210511113859.b0526f3d8744 -Provides: bundled(golang(golang.org/x/term)) = 0.0.0.20210503060354.a79de5458b56 -Provides: bundled(golang(golang.org/x/text)) = 0.3.7.0.20210503195748.5c7c50ebbd4f -Provides: bundled(golang(golang.org/x/tools)) = 0.1.2.0.20210519160823.49064d2332f9 +Provides: bundled(golang(github.com/google/pprof)) = 0.0.0.20211104044539.f987b9c94b31 +Provides: bundled(golang(github.com/ianlancetaylor/demangle)) = 0.0.0.20210905161508.09a460cdf81d +Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20210923205945.b76863e36670 +Provides: bundled(golang(golang.org/x/crypto)) = 0.0.0.20211108221036.ceb1ce70b4fa +Provides: bundled(golang(golang.org/x/mod)) = 0.6.0.dev.0.20211102181907.3a5865c02020 +Provides: bundled(golang(golang.org/x/net)) = 0.0.0.20211209124913.491a49abca63 +Provides: bundled(golang(golang.org/x/sync)) = 0.0.0.20210220032951.036812b2e83c +Provides: bundled(golang(golang.org/x/sys)) = 0.0.0.20211205182925.97ca703d548d +Provides: bundled(golang(golang.org/x/term)) = 0.0.0.20210927222741.03fcf44c2211 +Provides: bundled(golang(golang.org/x/text)) = 0.3.8.0.20211105212822.18b340fc7af2 +Provides: bundled(golang(golang.org/x/tools)) = 0.1.9.0.20211207220608.fd2bfb79a16a Provides: bundled(golang(golang.org/x/xerrors)) = 0.0.0.20200804184101.5ec99f83aff1 Requires: %{name}-bin = %{version}-%{release} @@ -535,6 +536,10 @@ fi %endif %changelog +* Tue Dec 14 2021 Mike Rochefort - 1.18beta1-1 +- Update to 1.18beta1 +- Related: rhbz#2002859 + * Tue Dec 14 2021 Alejandro Sáez - 1.17.5-1 - Update to 1.17.5 - Update bundles