Add patches back again

Resolves: RHEL-86067
Related: RHEL-7366

go-rpm-macros.spec

@@ -37,7 +37,7 @@ Version:   3.6.0
 ExclusiveArch: %{golang_arches} %{gccgo_arches}
 
 Name:      go-rpm-macros
-Release:   8%{?dist}
+Release:   9%{?dist}
 Summary:   Build-stage rpm automation for Go packages
 
 License:   GPLv3+
@@ -76,12 +76,8 @@ Provides:  compiler(go-compiler) = 1
 Obsoletes: go-compilers-gcc-go-compiler < %{version}-%{release}
 %endif
 
-# Replace golang-github-urfave-cli with a minimal
-# command line parser backend to bootstrap golist
-# without dependencies.
-#Patch1: golist-bootstrap-cli-no-vendor.patch
 # Add libexec to PATH in order to launch golist in every script
-#Patch2: 0001-Add-libexec-to-path-for-EPEL9-golist.patch
+Patch2: 0001-Add-libexec-to-path-for-EPEL9-golist.patch
 
 # RHEL 8 only provides the macros.go-srpm file which includes gobuild and gotest.
 # C9S also only provides the macros.go-srpm file but it also follows upstream which includes gobuild and gotest in the macros.go-compilers-gcc.
@@ -89,10 +85,10 @@ Obsoletes: go-compilers-gcc-go-compiler < %{version}-%{release}
 # This also sets the GOAMD64 variable to v2
 # Resolves: rhbz#1965292
 # Resolves: RHEL-5529
-#Patch3: add-gobuild-and-gotest.patch
+Patch3: add-gobuild-and-gotest.patch
 
 # Remove when rpm >= 4.17.0
-#Patch4: remove-isdefined-function.patch
+Patch4: remove-isdefined-function.patch
 
 %description
 This package provides build-stage rpm automation to simplify the creation of Go
@@ -148,17 +144,16 @@ done
 # unpack golist and patch
 %if 0%{?bundle_golist}
 # Add libexec to PATH
-#patch2 -p1
+%patch2 -p1
 tar -xf %{SOURCE1}
 tar -C %{golist_builddir} -xf %{SOURCE2}
 pushd %{golist_builddir}
-#patch1 -p1
 popd
 cp %{golist_builddir}/LICENSE LICENSE-golist
 %endif
 
-#patch3 -p1
-#patch4 -p1
+%patch3 -p1
+%patch -P 4 -p1
 
 %build
 # build golist
@@ -268,6 +263,11 @@ sed -i "s,golist ,%{golist_execdir}/golist ,g" \
 %{_rpmluadir}/fedora/srpm/*.lua
 
 %changelog
+* Fri Apr 04 2025 Alejandro Sáez <asm@redhat.com> - 3.6.0-9
+- Add patches back again
+- Resolves: RHEL-86067
+- Related: RHEL-7366
+
 * Thu Apr 03 2025 Alejandro Sáez <asm@redhat.com> - 3.6.0-8
 - Add full golist implementation
 - Resolves: RHEL-7366