AlmaLinux changes

SPECS/scap-security-guide.spec

@@ -6,7 +6,7 @@
 
 Name:		scap-security-guide
 Version:	0.1.60
-Release:	7%{?dist}
+Release:	7%{?dist}.alma
 Summary:	Security guidance and baselines in SCAP formats
 License:	BSD-3-Clause
 Group:		Applications/System
@@ -14,6 +14,8 @@ URL:		https://github.com/ComplianceAsCode/content/
 Source0:	https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2
 # Include tarball with last released rhel6 content
 Source1:	%{_static_rhel6_content}.tar.bz2
+# Patch allows only OSPP, PCI-DSS, E8 and STIG profiles in RHEL8 datastream
+# Untill ANSSI High profile is shipped we drop the ks too
 
 BuildArch:	noarch
 
@@ -65,6 +67,8 @@ Patch43:		scap-security-guide-0.1.61-fix_bug_in_delta_tailering_script-PR_8245.p
 Patch44:		scap-security-guide-0.1.61-fix_enable_fips_mode-PR_8255.patch
 Patch45:		scap-security-guide-0.1.61-delta_tailoring_fix-PR_8262.patch
 Patch46:		scap-security-guide-0.1.61-resize-anssi-kickstart-partitions-PR_8261.patch
+# AlmaLinux patches
+Patch1001:		0001-Add-AlmaLinux-8-support.patch
 
 BuildRequires:	libxslt
 BuildRequires:	expat
@@ -101,7 +105,6 @@ 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}) )
 %package	rule-playbooks
 Summary:	Ansible playbooks per each rule.
 Group:		System Environment/Base
@@ -109,7 +112,6 @@ Requires:	%{name} = %{version}-%{release}
 
 %description	rule-playbooks
 The %{name}-rule-playbooks package contains individual ansible playbooks per rule.
-%endif
 
 %prep
 %autosetup -p1 -b1
@@ -119,19 +121,14 @@ mkdir -p build
 cd build
 %cmake \
 -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE \
--DSSG_PRODUCT_RHEL7:BOOLEAN=TRUE \
--DSSG_PRODUCT_RHEL8:BOOLEAN=TRUE \
+-DSSG_PRODUCT_RHEL7:BOOLEAN=FALSE \
+-DSSG_PRODUCT_RHEL8:BOOLEAN=FALSE \
+-DSSG_PRODUCT_ALMALINUX8:BOOLEAN=TRUE \
 -DSSG_PRODUCT_FIREFOX:BOOLEAN=TRUE \
 -DSSG_PRODUCT_JRE:BOOLEAN=TRUE \
-%if %{defined centos}
--DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON \
-%else
 -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF \
-%endif
 -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF \
-%if ( %{defined rhel} && (! %{defined centos}) )
 -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON \
-%endif
 ../
 %cmake_build
 
@@ -139,10 +136,11 @@ cd build
 cd build
 %cmake_install
 
+# Disabled on AlmaLinux
 # Manually install pre-built rhel6 content
-cp -r %{_builddir}/%{_static_rhel6_content}/usr %{buildroot}
-cp -r %{_builddir}/%{_static_rhel6_content}/tables %{buildroot}%{_docdir}/%{name}
-cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name}
+# cp -r %{_builddir}/%{_static_rhel6_content}/usr %{buildroot}
+# cp -r %{_builddir}/%{_static_rhel6_content}/tables %{buildroot}%{_docdir}/%{name}
+# cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name}
 
 %files
 %{_datadir}/xml/scap/ssg/content
@@ -154,21 +152,20 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name
 %doc %{_docdir}/%{name}/LICENSE
 %doc %{_docdir}/%{name}/README.md
 %doc %{_docdir}/%{name}/Contributors.md
-%if ( %{defined rhel} && (! %{defined centos}) )
 %exclude %{_datadir}/%{name}/ansible/rule_playbooks
-%endif
 
 %files doc
 %doc %{_docdir}/%{name}/guides/*.html
 %doc %{_docdir}/%{name}/tables/*.html
 
-%if ( %{defined rhel} && (! %{defined centos}) )
 %files rule-playbooks
 %defattr(-,root,root,-)
 %{_datadir}/%{name}/ansible/rule_playbooks
-%endif
 
 %changelog
+* Fri Apr 01 2022 Eduard Abdullin <eabdullin@almalinux.org> - 0.1.60-7.alma
+- AlmaLinux changes
+
 * Thu Feb 24 2022 Watson Sato <wsato@redhat.com> - 0.1.60-7
 - Resize ANSSI kickstart partitions to accommodate GUI installs (RHBZ#2058033)