From 9a8464726b5bb04ed818af0f078e5b3dde770530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 11 Apr 2025 10:02:26 +0200 Subject: [PATCH] Fix malformed patch macros Related: RHEL-86067 Related: RHEL-7366 --- go-rpm-macros.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec index 70a9618..e2db619 100644 --- a/go-rpm-macros.spec +++ b/go-rpm-macros.spec @@ -37,7 +37,7 @@ Version: 3.6.0 ExclusiveArch: %{golang_arches} %{gccgo_arches} Name: go-rpm-macros -Release: 9%{?dist} +Release: 10%{?dist} Summary: Build-stage rpm automation for Go packages License: GPLv3+ @@ -144,7 +144,7 @@ done # unpack golist and patch %if 0%{?bundle_golist} # Add libexec to PATH -%patch2 -p1 +%patch -P 2 -p1 tar -xf %{SOURCE1} tar -C %{golist_builddir} -xf %{SOURCE2} pushd %{golist_builddir} @@ -152,7 +152,7 @@ popd cp %{golist_builddir}/LICENSE LICENSE-golist %endif -%patch3 -p1 +%patch -P 3 -p1 %patch -P 4 -p1 %build @@ -263,6 +263,11 @@ sed -i "s,golist ,%{golist_execdir}/golist ,g" \ %{_rpmluadir}/fedora/srpm/*.lua %changelog +* Fri Apr 11 2025 Alejandro Sáez - 3.6.0-10 +- Fix malformed patch macros +- Related: RHEL-86067 +- Related: RHEL-7366 + * Fri Apr 04 2025 Alejandro Sáez - 3.6.0-9 - Add patches back again - Resolves: RHEL-86067