commit b2c4689ccb3a4b8fdf1132f097f140ee92ddc3bc
Author: Jan Palus <[email protected]>
Date: Tue Dec 20 21:12:47 2022 +0100
up to 1.19.4
- tzdata patch no longer necessary since:
https://github.com/golang/go/commit/9465878
...he-bundled-tzdata-at-runtime-except-for-t.patch | 88 ----------------------
golang.spec | 8 +-
2 files changed, 3 insertions(+), 93 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index c81502e..9c2061e 100644
--- a/golang.spec
+++ b/golang.spec
@@ -26,16 +26,15 @@
Summary: Go compiler and tools
Summary(pl.UTF-8): Kompilator języka Go i narzędzia
Name: golang
-Version: 1.18.8
+Version: 1.19.4
Release: 1
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under
Public Domain
License: BSD and Public Domain
Group: Development/Languages
# Source0Download: https://golang.org/dl/
Source0: https://storage.googleapis.com/golang/go%{version}.src.tar.gz
-# Source0-md5: 4da6e6a0f709a4fe9f5b1033a8439a09
+# Source0-md5: 1577a8d801746d1c3fc165f0d3a27230
Patch0: ca-certs.patch
-Patch1:
0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
URL: https://golang.org/
BuildRequires: bash
BuildRequires: rpm-build >= 4.6
@@ -140,7 +139,6 @@ Dokumentacja do języka Go.
%setup -qc
%{__mv} go/* .
%patch0 -p1
-%patch1 -p1
# clean patch backups
find . -name '*.orig' | xargs -r %{__rm}
@@ -251,7 +249,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS CONTRIBUTORS LICENSE
+%doc CONTRIBUTING.md LICENSE README.md
%attr(755,root,root) %{_bindir}/cgo
%attr(755,root,root) %{_bindir}/go
%attr(755,root,root) %{_bindir}/gofmt
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
deleted file mode 100644
index 0447995..0000000
--- a/0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From edce31a2904846ae74e3c011f2cf5fddc963459e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <[email protected]>
-Date: Thu, 22 Mar 2018 12:07:32 +0100
-Subject: [PATCH 1/3] Don't use the bundled tzdata at runtime, except for the
- internal test suite
-
----
- src/time/internal_test.go | 7 +++++--
- src/time/zoneinfo_test.go | 3 ++-
- src/time/zoneinfo_unix.go | 2 --
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/time/internal_test.go b/src/time/internal_test.go
-index 76d5524124..e81ace5f64 100644
---- a/src/time/internal_test.go
-+++ b/src/time/internal_test.go
-@@ -4,13 +4,15 @@
-
- package time
-
-+import "runtime"
-+
- func init() {
- // force US/Pacific for time zone tests
- ForceUSPacificForTesting()
- }
-
- func initTestingZone() {
-- 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() + "; you may want to use -tags=timetzdata")
- }
-@@ -21,8 +23,9 @@ func initTestingZone() {
- var OrigZoneSources = zoneSources
-
- func forceZipFileForTesting(zipOnly bool) {
-- zoneSources = make([]string, len(OrigZoneSources))
-+ zoneSources = make([]string, len(OrigZoneSources)+1)
- copy(zoneSources, OrigZoneSources)
-+ zoneSources = append(zoneSources,
runtime.GOROOT()+"/lib/time/zoneinfo.zip")
- if zipOnly {
- zoneSources = zoneSources[len(zoneSources)-1:]
- }
-diff --git a/src/time/zoneinfo_test.go b/src/time/zoneinfo_test.go
-index 7a55d4f618..6063ca1195 100644
---- a/src/time/zoneinfo_test.go
-+++ b/src/time/zoneinfo_test.go
-@@ -8,6 +8,7 @@ import (
- "fmt"
- "os"
- "reflect"
-+ "runtime"
- "testing"
- "time"
- )
-@@ -128,7 +129,7 @@ func TestLoadLocationFromTZData(t *testing.T) {
- t.Fatal(err)
- }
-
-- tzinfo, err := time.LoadTzinfo(locationName,
time.OrigZoneSources[len(time.OrigZoneSources)-1])
-+ tzinfo, err := time.LoadTzinfo(locationName,
runtime.GOROOT()+"/lib/time/zoneinfo.zip")
- if err != nil {
- t.Fatal(err)
- }
-diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
-index 88313aa0ed..d9596115ef 100644
---- a/src/time/zoneinfo_unix.go
-+++ b/src/time/zoneinfo_unix.go
-@@ -12,7 +12,6 @@
- package time
-
- import (
-- "runtime"
- "syscall"
- )
-
-@@ -22,7 +21,6 @@ var zoneSources = []string{
- "/usr/share/zoneinfo/",
- "/usr/share/lib/zoneinfo/",
- "/usr/lib/locale/TZ/",
-- runtime.GOROOT() + "/lib/time/zoneinfo.zip",
- }
-
- func initLocal() {
---
-2.14.3
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/golang.git/commitdiff/b2c4689ccb3a4b8fdf1132f097f140ee92ddc3bc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
