From 6387a060361d75ac35d0b2600fd490249ba4973d Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 11 Nov 2024 00:28:15 +0800 Subject: [PATCH] adopt to new cmake macro --- scap-security-guide.spec | 23 ++++++++++++++--------- scap-security-guide.yaml | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index c7c4406..78d1b7c 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,6 +1,9 @@ +%undefine __cmake_in_source_build +%global _vpath_builddir build + Name: scap-security-guide Version: 0.1.68 -Release: 4 +Release: 5 Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -37,25 +40,24 @@ present in %{name} package. %prep %autosetup -n %{name}-%{version} -p1 -mkdir build %build -cd build -%cmake -DSSG_SCE_ENABLED=ON ../ -%make_build +%cmake -DSSG_SCE_ENABLED=ON +%cmake_build %install -cd build -%make_install +%cmake_install + +rm -f %{buildroot}%{_docdir}/%{name}/LICENSE %files +%license LICENSE %{_datadir}/xml/scap/ssg/content %{_datadir}/%{name}/kickstart %{_datadir}/%{name}/ansible %{_datadir}/%{name}/tailoring %{_datadir}/%{name}/bash -%lang(en) %{_mandir}/man8/scap-security-guide.8.* -%doc %{_docdir}/%{name}/LICENSE +%{_mandir}/man8/scap-security-guide.8.* %doc %{_docdir}/%{name}/README.md %doc %{_docdir}/%{name}/Contributors.md @@ -64,6 +66,9 @@ cd build %doc %{_docdir}/%{name}/tables/*.html %changelog +* Mon Nov 11 2024 Funda Wang - 0.1.68-5 +- adopt to new cmake macro + * Sat Feb 24 2024 wangqingsan - 0.1.68-4 - optimiz rules for openEuler diff --git a/scap-security-guide.yaml b/scap-security-guide.yaml index 27d61a5..b9e4fa7 100644 --- a/scap-security-guide.yaml +++ b/scap-security-guide.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: ComplianceAsCode/content tag_prefix: ^v -seperator: . +separator: . -- Gitee