From 6c1a7a7f1275cadd92b0d207a9e9daf703042280 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Dec 07 2015 17:06:09 +0000 Subject: Use the CentOS SCAP content --- diff --git a/SPECS/scap-security-guide.spec b/SPECS/scap-security-guide.spec index aa2cc05..d84cea2 100644 --- a/SPECS/scap-security-guide.spec +++ b/SPECS/scap-security-guide.spec @@ -76,12 +76,12 @@ mkdir -p %{buildroot}%{_mandir}/en/man8/ # Add in RHEL-7 core content (SCAP) cp -a RHEL/7/dist/content/ssg-rhel7-cpe-dictionary.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ cp -a RHEL/7/dist/content/ssg-rhel7-cpe-oval.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ -cp -a RHEL/7/dist/content/ssg-rhel7-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ +cp -a RHEL/7/dist/content/ssg-centos7-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ cp -a RHEL/7/dist/content/ssg-rhel7-oval.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ -cp -a RHEL/7/dist/content/ssg-rhel7-xccdf.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ +cp -a RHEL/7/dist/content/ssg-centos7-xccdf.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ # Add in RHEL-6 datastream (SCAP) -cp -a RHEL/6/dist/content/ssg-rhel6-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content +cp -a RHEL/6/dist/content/ssg-centos6-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content # Add in Firefox datastream (SCAP) cp -a Firefox/dist/content/ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content @@ -112,9 +112,12 @@ cp -a docs/scap-security-guide.8 %{buildroot}%{_mandir}/en/man8/scap-security-gu %files doc %defattr(-,root,root,-) -%doc RHEL/6/output/ssg-rhel6-guide-*.html RHEL/7/output/ssg-rhel7-guide-*.html JRE/output/ssg-jre-guide-*.html Firefox/output/ssg-firefox-guide-*.html +%doc RHEL/6/output/ssg-centos6-guide-*.html RHEL/7/output/ssg-centos7-guide-*.html JRE/output/ssg-jre-guide-*.html Firefox/output/ssg-firefox-guide-*.html %changelog +* Wed Nov 25 2015 brian@bstinson.com 0.1.25-3.centos +- Use the CentOS SCAP content + * Fri Oct 02 2015 Jan iankko Lieskovsky 0.1.25-3 - Drop "Verify and Correct File Permissions with RPM" rule from the PCI-DSS profile for Red Hat Enterprise Linux 7 (RH BZ#1267861)