From 50defcc683032099c51b72d203aa883375e13826 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 26 Nov 2019 09:17:56 -0500 Subject: [PATCH 1/4] Small fixes to the spec and tighten up the file list Signed-off-by: Neal Gompa --- golang.spec | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/golang.spec b/golang.spec index 73f5afd..bcb6697 100644 --- a/golang.spec +++ b/golang.spec @@ -32,6 +32,9 @@ %global golibdir %{_libdir}/golang +# This macro may not always be defined, ensure it is +%{!?gopath: %global gopath %{_datadir}/gocode} + # Golang build options. # Build golang using external/internal(close to cgo disabled) linking. @@ -106,7 +109,7 @@ Name: golang Version: 1.13.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain License: BSD and Public Domain @@ -269,6 +272,8 @@ BuildArch: noarch %package bin Summary: Golang core compiler tools +# Some distributions refer to this package by this name +Provides: %{name}-go = %{version}-%{release} Requires: go = %{version}-%{release} # Pre-go1.5, all arches had to be bootstrapped individually, before usable, and # env variables to compile for the target os-arch. @@ -338,11 +343,7 @@ Requires: %{name} = %{version}-%{release} %endif %prep -%setup -q -n go - -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n go cp %{SOURCE1} ./src/runtime/ @@ -530,21 +531,18 @@ fi %files -%doc AUTHORS CONTRIBUTORS LICENSE PATENTS +%license LICENSE PATENTS +%doc AUTHORS CONTRIBUTORS # VERSION has to be present in the GOROOT, for `go install std` to work %doc %{goroot}/VERSION %dir %{goroot}/doc -%doc %{goroot}/doc/* # go files %dir %{goroot} -%exclude %{goroot}/bin/ -%exclude %{goroot}/pkg/ -%exclude %{goroot}/src/ -%exclude %{goroot}/doc/ -%exclude %{goroot}/misc/ -%exclude %{goroot}/test/ -%{goroot}/* +%{goroot}/api/ +%{goroot}/lib/time/ +%{goroot}/favicon.ico +%{goroot}/robots.txt # ensure directory ownership, so they are cleaned up if empty %dir %{gopath} @@ -560,27 +558,32 @@ fi # gdbinit (for gdb debugging) %{_sysconfdir}/gdbinit.d -%files -f go-src.list src +%files src -f go-src.list -%files -f go-docs.list docs +%files docs -f go-docs.list -%files -f go-misc.list misc +%files misc -f go-misc.list -%files -f go-tests.list tests +%files tests -f go-tests.list -%files -f go-pkg.list bin +%files bin -f go-pkg.list %{_bindir}/go %{_bindir}/gofmt +%{goroot}/bin/linux_%{gohostarch}/go +%{goroot}/bin/linux_%{gohostarch}/gofmt %if %{shared} -%files -f go-shared.list shared +%files shared -f go-shared.list %endif %if %{race} -%files -f go-race.list race +%files race -f go-race.list %endif %changelog +* Tue Nov 25 2019 Neal Gompa - 1.13.4-2 +- Small fixes to the spec and tighten up the file list + * Fri Nov 01 2019 Jakub Čajka - 1.13.4-1 - Rebase to go1.13.4 - Resolves BZ#1767673 From a522b096387404c36746bb159679bd6ff00f82ff Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 4 Dec 2019 09:05:04 -0500 Subject: [PATCH 2/4] Fix date for changelog entry Signed-off-by: Neal Gompa --- golang.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/golang.spec b/golang.spec index bcb6697..ad48742 100644 --- a/golang.spec +++ b/golang.spec @@ -581,7 +581,7 @@ fi %endif %changelog -* Tue Nov 25 2019 Neal Gompa - 1.13.4-2 +* Tue Nov 26 2019 Neal Gompa - 1.13.4-2 - Small fixes to the spec and tighten up the file list * Fri Nov 01 2019 Jakub Čajka - 1.13.4-1 From 1524937377b8a0728679f62da40b974ac9c62114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Thu, 5 Dec 2019 13:39:28 +0100 Subject: [PATCH 3/4] Rebase to go1.13.5 --- .gitignore | 1 + golang.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2b7c8a7..8087f5a 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /go1.13.1.src.tar.gz /go1.13.3.src.tar.gz /go1.13.4.src.tar.gz +/go1.13.5.src.tar.gz diff --git a/golang.spec b/golang.spec index ad48742..9d416fa 100644 --- a/golang.spec +++ b/golang.spec @@ -105,11 +105,11 @@ %endif %global go_api 1.13 -%global go_version 1.13.4 +%global go_version 1.13.5 Name: golang -Version: 1.13.4 -Release: 2%{?dist} +Version: 1.13.5 +Release: 1%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain License: BSD and Public Domain @@ -581,6 +581,9 @@ fi %endif %changelog +* Thu Dec 05 2019 Jakub Čajka - 1.13.5-1 +- Rebase to go1.13.5 + * Tue Nov 26 2019 Neal Gompa - 1.13.4-2 - Small fixes to the spec and tighten up the file list diff --git a/sources b/sources index 1cd5e1d..f9cc1b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.13.4.src.tar.gz) = e8155cdceca2ebefd386feef98223bbdc92d9316f7188d4ba701cf43a723b75a9bf67a1eb92ac80987b7a113a2fb6981ef235292bec7dd3964805b7c33abdbb1 +SHA512 (go1.13.5.src.tar.gz) = bc9ddb12855c66dba5fe859bd13b7b3163259b8a8b0d3cbf6892e528ae4c6418c6b4c0d49838e7a5fc2e9f404484899b8f30c45e49e7d30109093025b62ed6c0 From fbfc80f07170dee38804e3a1c85f91d0b3c415fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Mon, 13 Jan 2020 22:15:11 +0100 Subject: [PATCH 4/4] Rebase to go1.13.6 --- .gitignore | 1 + golang.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8087f5a..2f45c1b 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ /go1.13.3.src.tar.gz /go1.13.4.src.tar.gz /go1.13.5.src.tar.gz +/go1.13.6.src.tar.gz diff --git a/golang.spec b/golang.spec index 9d416fa..976b80b 100644 --- a/golang.spec +++ b/golang.spec @@ -105,10 +105,10 @@ %endif %global go_api 1.13 -%global go_version 1.13.5 +%global go_version 1.13.6 Name: golang -Version: 1.13.5 +Version: 1.13.6 Release: 1%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain @@ -581,6 +581,9 @@ fi %endif %changelog +* Mon Jan 13 2020 Jakub Čajka - 1.13.6-1 +- Rebase to go1.13.6 + * Thu Dec 05 2019 Jakub Čajka - 1.13.5-1 - Rebase to go1.13.5 diff --git a/sources b/sources index f9cc1b1..e30151f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go1.13.5.src.tar.gz) = bc9ddb12855c66dba5fe859bd13b7b3163259b8a8b0d3cbf6892e528ae4c6418c6b4c0d49838e7a5fc2e9f404484899b8f30c45e49e7d30109093025b62ed6c0 +SHA512 (go1.13.6.src.tar.gz) = dffb6e06eea0b1541901dfbed8d28e8cc1eac3184dc40a19ed3637737df796a67a2e7170b228e1003d36b14e6f0f13bb8be9d2a702834a9c06228d1821659528