Rebase to 1.23.1

Resolves: RHEL-34260
This commit is contained in:
Derek Parker 2024-09-24 17:12:29 -04:00
parent 4c1b87cc27
commit 9d532e69fa
3 changed files with 11 additions and 9 deletions

2
.gitignore vendored
View File

@ -154,3 +154,5 @@
/go1.22.5.src.tar.gz /go1.22.5.src.tar.gz
/go1.22.5-1-openssl-fips.tar.gz /go1.22.5-1-openssl-fips.tar.gz
/go1.22.5-2-openssl-fips.tar.gz /go1.22.5-2-openssl-fips.tar.gz
/go1.23.1-1-openssl-fips.tar.gz
/go1.23.1.src.tar.gz

View File

@ -101,18 +101,18 @@
%global gohostarch s390x %global gohostarch s390x
%endif %endif
%global go_api 1.22 %global go_api 1.23
# Use only for prerelease versions # Use only for prerelease versions
#global go_prerelease rc3 #global go_prerelease rc3
%global go_patch 5 %global go_patch 1
%global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}} %global go_version %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease:~%{go_prerelease}}
%global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease} %global go_source %{go_api}%{?go_patch:.%{go_patch}}%{?go_prerelease}
# Go FIPS package release # Go FIPS package release
%global pkg_release 2 %global pkg_release 1
# For rpmdev-bumpspec and releng automation. # For rpmdev-bumpspec and releng automation.
%global baserelease 1 %global baserelease 3
Name: golang Name: golang
Version: %{go_version} Version: %{go_version}
Release: %autorelease Release: %autorelease
@ -428,7 +428,7 @@ rm -f $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_l
touch $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_list touch $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_list
################## ##################
# Register files # # Register files #
################## ##################
pushd $RPM_BUILD_ROOT%{goroot} pushd $RPM_BUILD_ROOT%{goroot}
find src/ -type d -a \( ! -name testdata -a ! -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $src_list find src/ -type d -a \( ! -name testdata -a ! -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $src_list
@ -455,7 +455,7 @@ pushd $RPM_BUILD_ROOT%{goroot}
echo "%%{goroot}/$file" >> $shared_list echo "%%{goroot}/$file" >> $shared_list
echo "%%{golibdir}/$(basename $file)" >> $shared_list echo "%%{golibdir}/$(basename $file)" >> $shared_list
done done
find pkg/*_dynlink/ -type d -printf '%%%dir %{goroot}/%p\n' >> $shared_list find pkg/*_dynlink/ -type d -printf '%%%dir %{goroot}/%p\n' >> $shared_list
find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list
%endif %endif

View File

@ -1,2 +1,2 @@
SHA512 (go1.22.5.src.tar.gz) = 798c2bd5d59be1fb5d7af98893fa7bb68322117facfdee546a37175ec5e8be634f2bed2d8d0e7d4d0555b354c8e9d72b3829c39670d3be2d2328376a00a48576 SHA512 (go1.23.1-1-openssl-fips.tar.gz) = 4609703ec0bc4cbc8a0116d70e641e670dbbcf16c260145c5506722e32125ff65e4c4ae1ef839c19622fee70f3fa4bdf509760f66d87bd1ed4ddd5bb2272fa86
SHA512 (go1.22.5-2-openssl-fips.tar.gz) = eec9e997c88ef92269120ab96d538e05bf60f1c1329923db04d4fb4ff1bfa8c35d325cd75ac7363d3c5aea626b4ea15d94afe3a54be9944377fee902b574fb26 SHA512 (go1.23.1.src.tar.gz) = c1db053bab03c33b4ec4cbef6c8dfae279542cde433fdb787b564ccf797bb9ac6d191aae3152a860a9539956502f31003f746e924287040849afce5ccaaf0988