|
|
@@ -64,8 +64,8 @@
|
|
|
%global gohostarch 386
|
|
|
%endif
|
|
|
|
|
|
-%global go_api 1.5
|
|
|
-%global go_version 1.5.2
|
|
|
+%global go_api 1.8
|
|
|
+%global go_version 1.8.1
|
|
|
|
|
|
Name: golang
|
|
|
Version: %{go_version}
|
|
|
@@ -80,8 +80,6 @@ URL: http://golang.org/
|
|
|
# pre-processed by source.sh to make Mark.Twain-Tom.Sawyer.txt free again
|
|
|
Source0: https://storage.googleapis.com/golang/go%{go_version}.src.tar.gz
|
|
|
|
|
|
-# original removed by source.sh, replace by version from golang master branch with license scrubbed
|
|
|
-Source1: Mark.Twain-Tom.Sawyer.txt.bz2
|
|
|
|
|
|
# The compiler is written in Go. Needs go(1.4+) compiler for build.
|
|
|
BuildRequires: golang > 1.4
|
|
|
@@ -96,31 +94,13 @@ Requires: %{name}-src = %{version}-%{release}
|
|
|
|
|
|
Patch0: golang-1.2-verbose-build.patch
|
|
|
|
|
|
-# https://bugzilla.redhat.com/show_bug.cgi?id=1038683
|
|
|
-Patch1: golang-1.2-remove-ECC-p224.patch
|
|
|
-# Accept x509 certs with negative serial
|
|
|
-# https://bugzilla.redhat.com/show_bug.cgi?id=1290543
|
|
|
-# https://github.com/golang/go/issues/8265
|
|
|
-Patch2: bz1290543.patch
|
|
|
-
|
|
|
# use the arch dependent path in the bootstrap
|
|
|
-Patch212: golang-1.5-bootstrap-binary-path.patch
|
|
|
-
|
|
|
-# disable TestGdbPython
|
|
|
-# https://github.com/golang/go/issues/11214
|
|
|
-Patch213: go1.5beta1-disable-TestGdbPython.patch
|
|
|
-
|
|
|
-# disable TestCloneNEWUSERAndRemapNoRootDisableSetgroups
|
|
|
-# this is not possible in the limitied build chroot
|
|
|
-Patch214: go1.5beta2-disable-TestCloneNEWUSERAndRemapNoRootDisableSetgroups.patch
|
|
|
+Patch212: golang-1.8.1-bootstrap-binary-path.patch
|
|
|
|
|
|
# we had been just removing the zoneinfo.zip, but that caused tests to fail for users that
|
|
|
# later run `go test -a std`. This makes it only use the zoneinfo.zip where needed in tests.
|
|
|
Patch215: ./go1.5-zoneinfo_testing_only.patch
|
|
|
|
|
|
-# https://bugzilla.redhat.com/show_bug.cgi?id=1271709
|
|
|
-Patch216: ./golang-1.5.1-a3156aaa12.patch
|
|
|
-
|
|
|
# These are the only RHEL/Fedora architectures that we compile this package for
|
|
|
ExclusiveArch: %{golang_arches}
|
|
|
|
|
|
@@ -134,7 +114,7 @@ Source102: macros.golang
|
|
|
%package docs
|
|
|
Summary: Golang compiler docs
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
-BuildArch: noarch
|
|
|
+#BuildArch: noarch
|
|
|
Obsoletes: %{name}-docs < 1.1-4
|
|
|
|
|
|
%description docs
|
|
|
@@ -143,7 +123,7 @@ Obsoletes: %{name}-docs < 1.1-4
|
|
|
%package misc
|
|
|
Summary: Golang compiler miscellaneous sources
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
-BuildArch: noarch
|
|
|
+#BuildArch: noarch
|
|
|
|
|
|
%description misc
|
|
|
%{summary}.
|
|
|
@@ -151,14 +131,14 @@ BuildArch: noarch
|
|
|
%package tests
|
|
|
Summary: Golang compiler tests for stdlib
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
-BuildArch: noarch
|
|
|
+#BuildArch: noarch
|
|
|
|
|
|
%description tests
|
|
|
%{summary}.
|
|
|
|
|
|
%package src
|
|
|
Summary: Golang compiler source tree
|
|
|
-BuildArch: noarch
|
|
|
+#BuildArch: noarch
|
|
|
%description src
|
|
|
%{summary}
|
|
|
|
|
|
@@ -199,23 +179,11 @@ Summary: Golang shared object libraries
|
|
|
# increase verbosity of build
|
|
|
%patch0 -p1
|
|
|
|
|
|
-# remove the P224 curve
|
|
|
-%patch1 -p1
|
|
|
-
|
|
|
-%patch2 -p1
|
|
|
-
|
|
|
# use the arch dependent path in the bootstrap
|
|
|
%patch212 -p1
|
|
|
|
|
|
-# disable TestGdbPython
|
|
|
-%patch213 -p1
|
|
|
-
|
|
|
-# disable TestCloneNEWUSERAndRemapNoRootDisableSetgroups
|
|
|
-%patch214 -p1
|
|
|
+%patch215 -p1
|
|
|
|
|
|
-%patch216 -p1
|
|
|
-
|
|
|
-cp %{SOURCE1} "$(pwd)/src/compress/bzip2/testdata/Mark.Twain-Tom.Sawyer.txt.bz2"
|
|
|
|
|
|
%build
|
|
|
# bootstrap compiler GOROOT
|
|
|
@@ -427,6 +395,18 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Jun 5 2017 IWAI, Masaharu <iwaim.sub@gmail.com> 1.8.1-1
|
|
|
+- update to 1.8.1
|
|
|
+- remove BuildArch tags
|
|
|
+- drop Source1
|
|
|
+- drop patches
|
|
|
+ - remove ECC p224 patch (Patch1)
|
|
|
+ - X.509 patch (Patch2): upstream merged
|
|
|
+ - disable TestGdbPython patch (Patch213)
|
|
|
+ - disable TestCloneNEWUSERAndRemapNoRootDisableSetgroups patch (Patch214)
|
|
|
+ - drop Patch216: upstream fixed
|
|
|
+- update bootstrap binary path patch (Patch212)
|
|
|
+
|
|
|
* Mon Dec 21 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.2-1
|
|
|
- new upstream release.
|
|
|
|
iwaim