From 9a7b7282fc8565789cd5ba4ee32cdc0564ac7a9f Mon Sep 17 00:00:00 2001 From: wenyuzifang Date: Thu, 14 Aug 2025 16:43:00 +0800 Subject: [PATCH] Update code from upstream --- go-rpm-macros.spec | 11 +++++++++-- golist-0.10.4.tar.gz | Bin 0 -> 6554 bytes remove-isdefined-function.patch | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 golist-0.10.4.tar.gz create mode 100644 remove-isdefined-function.patch diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec index 03de2e4..6d01216 100644 --- a/go-rpm-macros.spec +++ b/go-rpm-macros.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %bcond_with golist %global golang_arches x86_64 aarch64 loongarch64 riscv64 @@ -9,14 +9,18 @@ ExclusiveArch: %{golang_arches} Name: go-rpm-macros -Version: 3.6.0 +BuildRequires: golang +Version: 3.6.0 Release: %{anolis_release}%{?dist} Summary: Build-stage rpm automation for Go packages License: GPLv3+ URL: https://pagure.io/%{name} Source: https://pagure.io/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Source: https://pagure.io/golist/archive/v0.10.4/golist-0.10.4.tar.gz +Source2: golist-0.10.4-vendor.tar.xz Patch1: 1001-modify-for-anolis.patch +Patch2: remove-isdefined-function.patch Requires: go-srpm-macros = %{version}-%{release} go-filesystem = %{version}-%{release} %if %{with golist} @@ -133,6 +137,9 @@ install -m 0644 -vp rpm/macros.d/macros.go-compilers-golang \ %doc README.md %changelog +* Thu Aug 14 2025 Wenyuzifang - 3.6.0-3 +- Apply patch to ensure compatibility with RHEL 9.5 RPM and avoid build failures +- Resolves: RHEL-XXXXX (commit reference: RHEL-5529) * Sat Apr 26 2025 Shangtong Guo - 3.6.0-2 - add support for riscv64 build diff --git a/golist-0.10.4.tar.gz b/golist-0.10.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a1ed64baeb0c4c838ced18459f4d44baa30943ad GIT binary patch literal 6554 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 M2~I3s@BnxK0MRCkv;Y7A literal 0 HcmV?d00001 diff --git a/remove-isdefined-function.patch b/remove-isdefined-function.patch new file mode 100644 index 0000000..b0dd80d --- /dev/null +++ b/remove-isdefined-function.patch @@ -0,0 +1,27 @@ +From 75a528c97a3960e993d378ab3bedd37be3620975 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= +Date: Tue, 30 Jul 2024 17:05:39 +0200 +Subject: [PATCH] Avoid using rpm.isdefined function + +isdefined is in rpm >= 4.17.0 but RHEL 9.5 is a little bit behind that +version so if fails. This should behave similar. +--- + rpm/lua/srpm/go.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rpm/lua/srpm/go.lua b/rpm/lua/srpm/go.lua +index 01a43a1..4f8011b 100644 +--- a/rpm/lua/srpm/go.lua ++++ b/rpm/lua/srpm/go.lua +@@ -69,7 +69,7 @@ local function rpmname(goipath, compatid) + -- numbers on top of it, keep a - prefix before version strings + result = string.gsub(result, "%-v([%.%d]+)$", "-%1") + result = string.gsub(result, "%-v([%.%d]+%-)", "-%1") +- if rpm.isdefined('go_use_new_versioning') then ++ if rpm.expand("%{?go_use_new_versioning}") ~= "" then + -- according to the guidelines, if the base package name does not end with + -- a digit, the version MUST be directly appended to the package name with + -- no intervening separator. +-- +2.45.2 + -- Gitee