diff --git a/golang.spec b/golang.spec index fd6d64e..c9a24a2 100644 --- a/golang.spec +++ b/golang.spec @@ -66,7 +66,7 @@ Name: golang Version: 1.21.4 -Release: 4 +Release: 5 Summary: The Go Programming Language License: BSD and Public Domain URL: https://golang.org/ @@ -120,6 +120,11 @@ Obsoletes: %{name}-vim < 1.4 Obsoletes: emacs-%{name} < 1.4 Requires: %{vendor}-rpm-config +Patch6001: backport-0001-release-branch.go1.21-crypto-x509-make-sure-pub-key-.patch +Patch6002: backport-0002-release-branch.go1.21-html-template-escape-additiona.patch +Patch6003: backport-0003-release-branch.go1.21-net-textproto-mime-multipart-a.patch +Patch6004: backport-0004-release-branch.go1.21-net-http-net-http-cookiejar-av.patch + ExclusiveArch: %{golang_arches} %description @@ -312,7 +317,7 @@ export GO_TEST_TIMEOUT_SCALE=2 %if %{fail_on_tests} echo tests ignored %else -./run.bash --no-rebuild -v -v -v -k go_test:testing || : +./run.bash --no-rebuild -v -k -run='!(cmd/go|go/build|cmd/internal/testdir|cmd/link|cmd/nm|cmd/cgo/internal/testlife|cmd/cgo/internal/teststdio|cmd/cgo/internal/testerrors|tyepparams|race|flag|cgo_stdio|cgo_life|cgo_errors|test:0_1|api)' %endif cd .. @@ -357,6 +362,9 @@ fi %files devel -f go-tests.list -f go-misc.list -f go-src.list %changelog +* Thu Mar 28 2024 hanchao - 1.21.4-5 +- enabling the patches + * Tue Mar 26 2024 Wenlong Zhang - 1.21.4-4 - fix build error for loongarch64