diff --git a/.gitignore b/.gitignore index c4616f3..9498959 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/go-go-1.14.4-1-openssl-fips.tar.gz +SOURCES/go-go-1.14.7-1-openssl-fips.tar.gz diff --git a/.golang.metadata b/.golang.metadata index 4cbcc3d..503afcd 100644 --- a/.golang.metadata +++ b/.golang.metadata @@ -1 +1 @@ -c68072d707cf093fba93bc2d7cda172cd3749120 SOURCES/go-go-1.14.4-1-openssl-fips.tar.gz +34b2d4c5b30d51d1a02c6cea91dc27ce9dac88b6 SOURCES/go-go-1.14.7-1-openssl-fips.tar.gz diff --git a/SPECS/golang.spec b/SPECS/golang.spec index e927429..95b6d2c 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -96,7 +96,7 @@ %endif %global go_api 1.14 -%global go_version 1.14.4 +%global go_version 1.14.7 %global pkg_release 1 Name: golang @@ -139,6 +139,11 @@ 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 @@ -232,6 +237,8 @@ Requires: %{name} = %{version}-%{release} %patch221 -p1 +#%patch240917 -p1 + cp %{SOURCE1} ./src/runtime/ %build @@ -498,6 +505,17 @@ cd .. %endif %changelog +* Tue Aug 18 2020 Alejandro Sáez - 1.14.7-1 +- Rebase to 1.14.7 + +* Mon Aug 03 2020 Alejandro Sáez - 1.14.6-1 +- Rebase to 1.14.6 +- Resolves: rhbz#1820596 + +* Wed Jul 08 2020 Alejandro Sáez - 1.14.4-2 +- Include patch to fix missing deferreturn on linux/ppc64le +- Resolves: rhbz#1854836 + * Thu Jun 25 2020 Alejandro Sáez - 1.14.4-1 - Rebase to 1.14.4