Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorder Utility Patches for Go 1.20 and 1.21 #1175

Merged
merged 1 commit into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions projects/golang/go/1.20/rpmbuild/SPECS/golang.spec
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ Provides: bundled(golang(golang.org/x/tools)) = 0.3.1.0.20230118190848.070db2996
Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-src = %{version}-%{release}

Patch2: 0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch
Patch3: 0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch
Patch4: 0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch
Patch5: 0104-add-method-to-skip-privd-tests-if-required.patch
Patch2: 0102-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch
Patch3: 0103-cmd-go-disable-Google-s-proxy-and-sumdb.patch
Patch4: 0104-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch
Patch5: 0105-add-method-to-skip-privd-tests-if-required.patch

# Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4
Expand Down
4 changes: 2 additions & 2 deletions projects/golang/go/1.21/rpmbuild/SPECS/golang.spec
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-src = %{version}-%{release}
Requires: go-filesystem

Patch1: 0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch
Patch4: 0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch
Patch1: 0101-Disable-Google-s-proxy-sumdb-and-toolchain.patch
zafs23 marked this conversation as resolved.
Show resolved Hide resolved
Patch4: 0104-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch

# Having documentation separate was broken
Obsoletes: %{name}-docs < 1.1-4
Expand Down