From 34ba0358029c19113694f4c0e6cafa35b4d395ba Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Fri, 27 Aug 2021 09:41:53 -0400 Subject: [PATCH] Conditionalize Fedora-specific configuration --- ignition.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 45675d5..0f2b8ac 100644 --- a/ignition.spec +++ b/ignition.spec @@ -1,5 +1,11 @@ # Generated by go2rpm 1.3 +%if 0%{?fedora} %bcond_without check +%else +# %gocheck isn't currently provided on CentOS/RHEL +# https://bugzilla.redhat.com/show_bug.cgi?id=1982298 +%bcond_with check +%endif # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition @@ -228,7 +234,11 @@ Ignition project's Github releases page. %endif %prep +%if 0%{?fedora} %goprep -k +%else +%forgeautosetup -p1 +%endif %autopatch -p1 %build @@ -264,8 +274,8 @@ cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ install -d -p %{buildroot}%{_bindir} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} -install -d -p %{buildroot}%{_datadir}/ignition %if 0%{?fedora} +install -d -p %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-x86_64-apple-darwin %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/ignition %endif @@ -303,6 +313,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition - Disable file fragment writing logic for SSH authorized_keys on RHEL/CentOS - Disable compressdwarf flag to avoid build failures on RHEL/CentOS - Disable cross-building of Ignition-validate on RHEL/CentOS +- Conditionalize Fedora-specific configuration * Fri Aug 6 2021 Sohan Kunkerkar - 2.12.0-1 - New release