Update config and AlmaLinux patch for 0.1.77

config.yaml

@@ -22,32 +22,16 @@ actions:
         count: 1
       - target: "spec"
         find: |
-              %cmake \
+              %if 0%{?centos}
-              -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE \
+              %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON
-              -DSSG_PRODUCT_RHEL7:BOOLEAN=TRUE \
-              -DSSG_PRODUCT_RHEL8: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
         replace: |
-              %cmake \
+              %if 0%{?centos}
-              -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE \
+              %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON
-              -DSSG_PRODUCT_RHEL7:BOOLEAN=FALSE \
+              %endif
-              -DSSG_PRODUCT_RHEL8:BOOLEAN=FALSE \
+              %if 0%{?almalinux}
-              -DSSG_PRODUCT_ALMALINUX8:BOOLEAN=TRUE \
+              %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_ALMALINUX%{almalinux}:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON
-              -DSSG_PRODUCT_FIREFOX:BOOLEAN=TRUE \
+              %endif
-              -DSSG_PRODUCT_JRE:BOOLEAN=TRUE \
-              -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF \
-              -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF \
-              -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON \
         count: 1
       - target: "spec"
         find: |
@@ -115,12 +99,12 @@ actions:
       enabled: true
 
   - changelog_entry:
-      - name: "Andrei Lukoshko"
+      - name: "Andrew Lukoshko"
         email: "alukoshko@almalinux.org"
         line:
           - "Add AlmaLinux support"
 
   - add_files:
       - type: "patch"
-        name: "0001-Add-AlmaLinux-8-support.patch"
+        name: "scap-security-guide-add-almalinux8-product.patch"
         number: 1001