Avoid double patch application on non-Fedora

This commit is contained in:
Benjamin Gilbert 2022-01-20 18:29:35 -05:00
parent 5b204a35e8
commit 7332568141

View File

@ -238,10 +238,10 @@ Ignition project's Github releases page.
%prep %prep
%if 0%{?fedora} %if 0%{?fedora}
%goprep -k %goprep -k
%autopatch -p1
%else %else
%forgeautosetup -p1 %forgeautosetup -p1
%endif %endif
%autopatch -p1
%build %build
export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true " export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true "
@ -313,6 +313,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
%changelog %changelog
* Thu Jan 20 2022 Benjamin Gilbert <bgilbert@redhat.com> - 2.13.0-3 * Thu Jan 20 2022 Benjamin Gilbert <bgilbert@redhat.com> - 2.13.0-3
- Fix LUKS volume reuse - Fix LUKS volume reuse
- Avoid double patch application on non-Fedora
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-2 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild