From a53fc569272df0280a58174206f5e8b05cd59f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Luka=C5=A1=C3=ADk?= Date: Wed, 7 Oct 2015 13:12:36 +0200 Subject: [PATCH] openscap-containers require atomic only on x86_64 This is pragmatic choice. (Upcomming) OpenSCAP-Daemon will need to import openscap-containers python fragments. We decide to fail in run-time when atomic features of OpenSCAP-Daemon are used on other architectures. --- openscap.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/openscap.spec b/openscap.spec index 978f687..a693a43 100644 --- a/openscap.spec +++ b/openscap.spec @@ -14,7 +14,7 @@ restorecon -R /usr/bin/oscap /usr/libexec/openscap; \ Name: openscap Version: 1.2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries License: LGPLv2+ @@ -168,7 +168,10 @@ for developing applications that use %{name}-engine-sce. Summary: Utils for scanning containers Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: %{name}-scanner atomic +Requires: %{name}-scanner +%ifarch x86_64 +Requires: atomic +%endif BuildArch: noarch %description containers @@ -332,6 +335,10 @@ rm -rf $RPM_BUILD_ROOT %{oscapdocker_pysitelib}/oscap_docker_python/* %changelog +* Wed Oct 07 2015 Šimon Lukašík - 1.2.6-2 +- put oscap-docker to openscap-containers subpackage +- require atomic package only when exists + * Mon Oct 05 2015 Zbyněk Moravec - 1.2.6-1 - upgrade to the latest upstream release