From 5d3f57ca9207608ce775803ecf585838457ec12e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 24 Nov 2022 12:52:04 -0500 Subject: [PATCH] Fix ELN build On RHEL, only the product-specific data for RHEL is built and shipped, but ELN is defined as the precursor to the next major version of RHEL, for which data has not yet been created upstream. Therefore, for ELN, follow Fedora which builds and ships data for all distributions. --- scap-security-guide.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 8f29321..40c3370 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -45,7 +45,7 @@ The %{name}-doc package contains HTML formatted documents containing hardening guidances that have been generated from XCCDF benchmarks present in %{name} package. -%if ( %{defined rhel} && (! %{defined centos}) ) +%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) ) %package rule-playbooks Summary: Ansible playbooks per each rule. Group: System Environment/Base @@ -60,7 +60,7 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul %define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=OFF -DSSG_BUILD_SCAP_12_DS=OFF %define cmake_defines_specific %{nil} -%if 0%{?rhel} +%if 0%{?rhel} && ! %{defined eln} %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON %endif %if 0%{?centos} @@ -84,7 +84,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %{_datadir}/%{name}/tailoring %lang(en) %{_mandir}/man8/scap-security-guide.8.* %doc %{_docdir}/%{name}/LICENSE -%if ( %{defined rhel} && (! %{defined centos}) ) +%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) ) %exclude %{_datadir}/%{name}/ansible/rule_playbooks %endif @@ -92,7 +92,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %doc %{_docdir}/%{name}/guides/*.html %doc %{_docdir}/%{name}/tables/*.html -%if ( %{defined rhel} && (! %{defined centos}) ) +%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) ) %files rule-playbooks %defattr(-,root,root,-) %{_datadir}/%{name}/ansible/rule_playbooks