config.yaml

@@ -2,112 +2,16 @@ actions:
   - replace:
       - target: "spec"
         find: |
-              %if ( %{defined rhel} && (! %{defined centos}) )
-              %package	rule-playbooks
-              Summary:	Ansible playbooks per each rule.
-              Group:		System Environment/Base
-              Requires:	%{name} = %{version}-%{release}
-              
-              %description	rule-playbooks
-              The %{name}-rule-playbooks package contains individual ansible playbooks per rule.
+              %if 0%{?centos}
+              %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON
               %endif
         replace: |
-              %package  rule-playbooks
-              Summary:  Ansible playbooks per each rule.
-              Group:    System Environment/Base
-              Requires: %{name} = %{version}-%{release}
-
-              %description  rule-playbooks
-              The %{name}-rule-playbooks package contains individual ansible playbooks per rule.
-        count: 1
-      - target: "spec"
-        find: |
-              %cmake \
-              -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE \
-              -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 \
+              %if 0%{?centos}
+              %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON
               %endif
-              -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF \
-              %if ( %{defined rhel} && (! %{defined centos}) )
-              -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON \
+              %if 0%{?almalinux}
+              %define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_ALMALINUX%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF
               %endif
-        replace: |
-              %cmake \
-              -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE \
-              -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 \
-              -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: |
-              # 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}
-              
-              # Manually install pre-built rhel7 content
-              cp -r %{_builddir}/%{_static_rhel7_content}/usr %{buildroot}
-              cp -r %{_builddir}/%{_static_rhel7_content}/tables %{buildroot}%{_docdir}/%{name}
-              cp -r %{_builddir}/%{_static_rhel7_content}/guides %{buildroot}%{_docdir}/%{name}
-
-              # create symlinks for ssg-<product>-ds-1.2.xml to ssg-<product>-ds.xml
-              # this is for backward compatibility
-              ln -s ssg-rhel8-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-rhel8-ds-1.2.xml
-              ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefox-ds-1.2.xml
-        replace: |
-              # Manually install pre-built rhel6 content
-              # Disabled on AlmaLinux
-              # 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}
-
-              # Manually install pre-built rhel7 content
-              # Disabled on AlmaLinux
-              # cp -r %{_builddir}/%{_static_rhel7_content}/usr %{buildroot}
-              # cp -r %{_builddir}/%{_static_rhel7_content}/tables %{buildroot}%{_docdir}/%{name}
-              # cp -r %{_builddir}/%{_static_rhel7_content}/guides %{buildroot}%{_docdir}/%{name}
-              
-              # create symlinks for ssg-<product>-ds-1.2.xml to ssg-<product>-ds.xml
-              # this is for backward compatibility
-              ln -s ssg-almalinux8-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-almalinux8-ds-1.2.xml
-              ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefox-ds-1.2.xml
-        count: 1
-      - target: "spec"
-        find: |
-              %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
-        replace: |
-              %exclude %{_datadir}/%{name}/ansible/rule_playbooks
-              
-              %files doc
-              %doc %{_docdir}/%{name}/guides/*.html
-              %doc %{_docdir}/%{name}/tables/*.html
-              
-              %files rule-playbooks
-              %defattr(-,root,root,-)
-              %{_datadir}/%{name}/ansible/rule_playbooks
         count: 1
 
   - modify_release:
@@ -115,12 +19,12 @@ actions:
       enabled: true
 
   - changelog_entry:
-      - name: "Andrei Lukoshko"
+      - name: "Andrew Lukoshko"
         email: "alukoshko@almalinux.org"
         line:
-          - "Add AlmaLinux support"
+          - "Add AlmaLinux 10 support"
 
   - add_files:
       - type: "patch"
-        name: "0001-Add-AlmaLinux-8-support.patch"
-        number: 1001
+        name: "scap-security-guide-0.1.74-add-almalinux10-product.patch"
+        number: 1000