Skip to content

Commit 0459c09

Browse files
committed
fix: spec: build system changes
- use ninja-build - ensure pkg-config is used - systemd-rpm-macros are used in spec - cmake requirement now: cmake_minimum_required(VERSION 2.8...3.19)
1 parent 37fc419 commit 0459c09

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

openscap.spec

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ URL: http://www.open-scap.org/
1010
Source0: https://github.com/OpenSCAP/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
1111
Source1: https://github.com/OpenSCAP/yaml-filter/archive/refs/tags/v0.2.0.tar.gz
1212
BuildRequires: make
13-
BuildRequires: cmake >= 2.6
13+
BuildRequires: cmake >= 2.8
14+
BuildRequires: ninja-build
15+
BuildRequires: pkg-config
16+
BuildRequires: systemd-rpm-macros
1417
BuildRequires: gcc
1518
BuildRequires: gcc-c++
1619
BuildRequires: swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser
@@ -146,11 +149,12 @@ tar xvzf %{SOURCE1} --directory=yaml-filter --strip-components=1
146149
%undefine __cmake_in_source_build
147150
# gconf is a legacy system not used any more, and it blocks testing of oscap-anaconda-addon
148151
# as gconf is no longer part of the installation medium
149-
%cmake \
152+
%cmake -G Ninja \
150153
-DENABLE_PERL=OFF \
151154
-DENABLE_DOCS=ON \
152155
-DOPENSCAP_PROBE_UNIX_GCONF=OFF \
153156
-DGCONF_LIBRARY=
157+
154158
%cmake_build
155159
make docs
156160

0 commit comments

Comments
 (0)