From c01116a026dfaa373665442b46d578a914d1ea3f Mon Sep 17 00:00:00 2001 From: Sajia Zafreen Date: Fri, 22 Sep 2023 11:21:30 -0700 Subject: [PATCH] Reorder Utility Patches --- ...02-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch} | 0 ...=> 0103-cmd-go-disable-Google-s-proxy-and-sumdb.patch} | 0 ...ink-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch} | 0 ...0105-add-method-to-skip-privd-tests-if-required.patch} | 0 projects/golang/go/1.20/rpmbuild/SPECS/golang.spec | 8 ++++---- ...0101-Disable-Google-s-proxy-sumdb-and-toolchain.patch} | 0 ...ink-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch} | 0 projects/golang/go/1.21/rpmbuild/SPECS/golang.spec | 4 ++-- 8 files changed, 6 insertions(+), 6 deletions(-) rename projects/golang/go/1.20/patches/{0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch => 0102-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch} (100%) rename projects/golang/go/1.20/patches/{0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch => 0103-cmd-go-disable-Google-s-proxy-and-sumdb.patch} (100%) rename projects/golang/go/1.20/patches/{0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch => 0104-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch} (100%) rename projects/golang/go/1.20/patches/{0104-add-method-to-skip-privd-tests-if-required.patch => 0105-add-method-to-skip-privd-tests-if-required.patch} (100%) rename projects/golang/go/1.21/patches/{0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch => 0101-Disable-Google-s-proxy-sumdb-and-toolchain.patch} (100%) rename projects/golang/go/1.21/patches/{0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch => 0104-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch} (100%) diff --git a/projects/golang/go/1.20/patches/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch b/projects/golang/go/1.20/patches/0102-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch similarity index 100% rename from projects/golang/go/1.20/patches/0002-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch rename to projects/golang/go/1.20/patches/0102-syscall-expose-IfInfomsg.X__ifi_pad-on-s390x.patch diff --git a/projects/golang/go/1.20/patches/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch b/projects/golang/go/1.20/patches/0103-cmd-go-disable-Google-s-proxy-and-sumdb.patch similarity index 100% rename from projects/golang/go/1.20/patches/0003-cmd-go-disable-Google-s-proxy-and-sumdb.patch rename to projects/golang/go/1.20/patches/0103-cmd-go-disable-Google-s-proxy-and-sumdb.patch diff --git a/projects/golang/go/1.20/patches/0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch b/projects/golang/go/1.20/patches/0104-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch similarity index 100% rename from projects/golang/go/1.20/patches/0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch rename to projects/golang/go/1.20/patches/0104-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch diff --git a/projects/golang/go/1.20/patches/0104-add-method-to-skip-privd-tests-if-required.patch b/projects/golang/go/1.20/patches/0105-add-method-to-skip-privd-tests-if-required.patch similarity index 100% rename from projects/golang/go/1.20/patches/0104-add-method-to-skip-privd-tests-if-required.patch rename to projects/golang/go/1.20/patches/0105-add-method-to-skip-privd-tests-if-required.patch diff --git a/projects/golang/go/1.20/rpmbuild/SPECS/golang.spec b/projects/golang/go/1.20/rpmbuild/SPECS/golang.spec index dc705f96c..48bf75b73 100644 --- a/projects/golang/go/1.20/rpmbuild/SPECS/golang.spec +++ b/projects/golang/go/1.20/rpmbuild/SPECS/golang.spec @@ -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 diff --git a/projects/golang/go/1.21/patches/0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch b/projects/golang/go/1.21/patches/0101-Disable-Google-s-proxy-sumdb-and-toolchain.patch similarity index 100% rename from projects/golang/go/1.21/patches/0001-Disable-Google-s-proxy-sumdb-and-toolchain.patch rename to projects/golang/go/1.21/patches/0101-Disable-Google-s-proxy-sumdb-and-toolchain.patch diff --git a/projects/golang/go/1.21/patches/0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch b/projects/golang/go/1.21/patches/0104-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch similarity index 100% rename from projects/golang/go/1.21/patches/0004-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch rename to projects/golang/go/1.21/patches/0104-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-avail.patch diff --git a/projects/golang/go/1.21/rpmbuild/SPECS/golang.spec b/projects/golang/go/1.21/rpmbuild/SPECS/golang.spec index d6888d297..fc30ea0fb 100644 --- a/projects/golang/go/1.21/rpmbuild/SPECS/golang.spec +++ b/projects/golang/go/1.21/rpmbuild/SPECS/golang.spec @@ -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 +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