diff --git a/scap-security-guide-0.1.39.tar.bz2 b/scap-security-guide-0.1.39.tar.bz2 deleted file mode 100644 index 3790ba4..0000000 Binary files a/scap-security-guide-0.1.39.tar.bz2 and /dev/null differ diff --git a/scap-security-guide-0.1.49.tar.bz2 b/scap-security-guide-0.1.49.tar.bz2 new file mode 100644 index 0000000..1cfea53 Binary files /dev/null and b/scap-security-guide-0.1.49.tar.bz2 differ diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 13c48e4..3b98e9f 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,39 +1,42 @@ -Name: scap-security-guide -Version: 0.1.39 -Release: 4 -Summary: Create security policy content for various platforms -License: Public Domain -URL: https://github.com/OpenSCAP/scap-security-guide -Source0: https://github.com/OpenSCAP/scap-security-guide/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 - -BuildArch: noarch - -BuildRequires: libxslt expat python2 openscap-scanner >= 1.2.5 python2-lxml cmake >= 2.8 python2-jinja2 PyYAML -Requires: xml-common openscap-scanner >= 1.2.5 -Obsoletes: openscap-content < 0:0.9.13 -Provides: openscap-content - +Name: scap-security-guide +Version: 0.1.49 +Release: 1 +Summary: Security guidance and baselines in SCAP formats +License: BSD-3-Clause +URL: https://github.com/ComplianceAsCode/content/ +Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 +BuildArch: noarch +BuildRequires: libxslt, expat, python3, openscap-scanner >= 1.2.5, cmake >= 3.8, python3-jinja2, python3-PyYAML +Requires: xml-common, openscap-scanner >= 1.2.5 +Obsoletes: openscap-content < 0:0.9.13 +Provides: openscap-content %description -The project's aim is to make it as easy as possible to write new and maintain existing security content in all the commonly used formats. -The security content can be used to scan bare-metal machines, virtual machines, virtual machine images (qcow2 and others), containers -(including Docker) and container images. +The scap-security-guide project provides a guide for configuration of the +system from the final system's security point of view. The guidance is specified +in the Security Content Automation Protocol (SCAP) format and constitutes +a catalog of practical hardening advice, linked to government requirements +where applicable. The project bridges the gap between generalized policy +requirements and specific implementation guidelines. The Fedora system +administrator can use the oscap CLI tool from openscap-scanner package, or the +scap-workbench GUI tool from scap-workbench package to verify that the system +conforms to provided guideline. Refer to scap-security-guide(8) manual page for +further information. -%package help -Summary: Help documentation and security guides for scap-security-guide -Requires: %{name} = %{version}-%{release} -Provides: %{name}-doc = %{version}-%{release} -Obsoletes: %{name}-doc < %{version}-%{release} - -%description help -This package contains help documentation and security guides related to scap-security-guide. +%package doc +Summary: HTML formatted security guides generated from XCCDF benchmarks +Requires: %{name} = %{version}-%{release} +%description doc +The %{name}-doc package contains HTML formatted documents containing +hardening guidances that have been generated from XCCDF benchmarks +present in %{name} package. %prep -%autosetup -p1 +%setup -q +mkdir build %build -install -d build cd build -%cmake .. +%cmake ../ %make_build %install @@ -41,19 +44,22 @@ cd build %make_install %files -%doc %{_docdir}/%{name}/LICENSE %{_datadir}/xml/scap/ssg/content %{_datadir}/%{name}/kickstart %{_datadir}/%{name}/ansible %{_datadir}/%{name}/bash %lang(en) %{_mandir}/man8/scap-security-guide.8.* - -%files help +%doc %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README.md %doc %{_docdir}/%{name}/Contributors.md + +%files doc %doc %{_docdir}/%{name}/guides/*.html %doc %{_docdir}/%{name}/tables/*.html %changelog +* Wed Oct 28 2020 Anan Fu - 0.1.49-1 +- upgrade to disable python2 + * Mon Oct 14 2019 dongjian - 0.1.39-4 - Package init