Fix malformed patch macros
Related: RHEL-86067 Related: RHEL-7366
This commit is contained in:
parent
3d00e20941
commit
9a8464726b
@ -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 <asm@redhat.com> - 3.6.0-10
|
||||
- Fix malformed patch macros
|
||||
- Related: RHEL-86067
|
||||
- Related: RHEL-7366
|
||||
|
||||
* Fri Apr 04 2025 Alejandro Sáez <asm@redhat.com> - 3.6.0-9
|
||||
- Add patches back again
|
||||
- Resolves: RHEL-86067
|
||||
|
Loading…
Reference in New Issue
Block a user