From 83f314aa21f57853372437a64ac108edde027ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Thu, 20 May 2021 15:43:38 +0200
Subject: [PATCH] Remove containers subpackage

It removes the oscap-docker completely because it depends on Docker
which has been superseded in RHEL by Podman. This aligns packaging with
RHEL 8, where we also don't have oscap-docker and oscap-podman is
shipped in openscap-utils subpackage.

The patch also moves the man page of oscap-chroot to the same subpackage
where oscap-chroot is shipped.

Resolves: RHBZ#1952789
---
 openscap.spec | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/openscap.spec b/openscap.spec
index a462f5e..6097c1c 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -1,6 +1,6 @@
 Name:           openscap
 Version:        1.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 License:        LGPLv2+
@@ -111,15 +111,6 @@ Requires:       pkgconfig
 The %{name}-engine-sce-devel package contains libraries and header files
 for developing applications that use %{name}-engine-sce.
 
-%package        containers
-Summary:        Utils for scanning containers
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       %{name}-scanner
-BuildArch:      noarch
-
-%description    containers
-Tool for scanning Atomic containers.
-
 %prep
 %autosetup -p1
 
@@ -129,6 +120,7 @@ Tool for scanning Atomic containers.
 %cmake \
     -DENABLE_PERL=OFF \
     -DENABLE_DOCS=ON \
+    -DENABLE_OSCAP_UTIL_DOCKER=OFF \
     -DOPENSCAP_PROBE_UNIX_GCONF=OFF \
     -DGCONF_LIBRARY=
 %cmake_build
@@ -177,32 +169,33 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
 %{_includedir}/openscap/sce_engine_api.h
 
 %files scanner
-%{_mandir}/man8/oscap.8*
+%{_mandir}/man8/oscap.8.gz
 %{_bindir}/oscap
+%{_mandir}/man8/oscap-chroot.8.gz
 %{_bindir}/oscap-chroot
 %{_sysconfdir}/bash_completion.d
 
 %files utils
 %doc docs/oscap-scan.cron
-%{_mandir}/man8/*
-%exclude %{_mandir}/man8/oscap.8*
-%exclude %{_mandir}/man8/oscap-docker.8*
-%{_bindir}/*
-%exclude %{_bindir}/oscap
-%exclude %{_bindir}/oscap-docker
-%exclude %{_bindir}/oscap-chroot
+%{_mandir}/man8/oscap-ssh.8.gz
+%{_bindir}/oscap-ssh
+%{_mandir}/man8/oscap-podman.8.gz
+%{_bindir}/oscap-podman
+%{_mandir}/man8/oscap-vm.8.gz
+%{_bindir}/oscap-vm
+%{_mandir}/man8/scap-as-rpm.8.gz
+%{_bindir}/scap-as-rpm
+%{_mandir}/man8/autotailor.8.gz
+%{_bindir}/autotailor
 
 %files engine-sce
 %{_libdir}/libopenscap_sce.so.*
-
-%files containers
-%{_bindir}/oscap-docker
-%{_mandir}/man8/oscap-docker.8*
-%{python3_sitelib}/oscap_docker_python/*
-%{_bindir}/oscap-podman
-%{_mandir}/man8/oscap-podman.8*
+%{_bindir}/oscap-run-sce-script
 
 %changelog
+* Thu May 20 2021 Jan Černý <jcerny@redhat.com> - 1:1.3.5-2
+- Remove containers subpackage
+
 * Fri Apr 23 2021 Jan Černý <jcerny@redhat.com> - 1:1.3.5-1
 - Update to the latest upstream release