From 2fd8db30964eb9a9783707278600818046cf9282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 Sep 2024 16:02:14 +0200 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 go1.20 revision da61c2128d3d55da035b8a535e082b1c --- go1.20.changes | 13 +++++++++++++ go1.20.spec | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/go1.20.changes b/go1.20.changes index cbb0249..9d9b8d6 100644 --- a/go1.20.changes +++ b/go1.20.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Feb 27 05:45:13 UTC 2024 - Jeff Kowalczyk + +- Packaging improvements: + * Use %patch -P N instead of deprecated %patchN + +------------------------------------------------------------------- +Tue Feb 6 22:28:04 UTC 2024 - Jeff Kowalczyk + +- Packaging improvements: + * boo#1219988 ensure VERSION file is present in GOROOT + as required by go tool dist and go tool distpack + ------------------------------------------------------------------- Tue Feb 6 18:22:28 UTC 2024 - Jeff Kowalczyk diff --git a/go1.20.spec b/go1.20.spec index 7faf287..31e699f 100644 --- a/go1.20.spec +++ b/go1.20.spec @@ -233,14 +233,14 @@ Go standard library compiled to a dynamically loadable shared object libstd.so # go %setup -q -n go -%patch7 -p1 +%patch -P 7 -p1 %if %{with gccgo} # Currently gcc-go does not manage an update-alternatives entry and will # never be symlinked as "go", even if gcc-go is the only installed go toolchain. # Patch go bootstrap scripts to find hardcoded go-(gcc-go-version) e.g. go-8 # Substitute defined gcc_go_version into gcc-go.patch sed -i "s/\$gcc_go_version/%{gcc_go_version}/" $RPM_SOURCE_DIR/gcc-go.patch -%patch8 -p1 +%patch -P 8 -p1 %endif cp %{SOURCE4} . @@ -353,6 +353,8 @@ for ext in *.{go,c,h,s,S,py,syso,bin}; do done # executable bash scripts called by go tool, etc find src -name "*.bash" -exec install -Dm655 \{\} %{buildroot}%{_datadir}/go/%{go_label}/\{\} \; +# VERSION file referenced by go tool dist and go tool distpack +find . -name VERSION -exec install -Dm655 \{\} %{buildroot}%{_datadir}/go/%{go_label}/\{\} \; # Trace viewer html and javascript files moved from misc/trace in # previous versions to src/cmd/trace/static in go1.19. # static contains pprof trace viewer html javascript and markdown