From 743af7f47b114cd8cc94ca0d3df41d698a00d03a683ddc1e859a6c974583d655 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 5 May 2024 14:47:35 +0000
Subject: [PATCH] Accepting request 1159922 from home:michals

Cherry-pick SLE change.

- Rename oscap-docker to oscap-containers and provide oscap-podman as well
  (Relates to jsc#SLE-12852)

OBS-URL: https://build.opensuse.org/request/show/1159922
OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=292
---
 openscap.changes |  6 ++++++
 openscap.spec    | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/openscap.changes b/openscap.changes
index d71cd83..0c1c856 100644
--- a/openscap.changes
+++ b/openscap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 20 18:37:30 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Rename oscap-docker to oscap-containers and provide oscap-podman as well
+  (Relates to jsc#SLE-12852)
+
 -------------------------------------------------------------------
 Wed Mar 20 08:56:12 UTC 2024 - Robert Frohl <rfrohl@suse.com>
 
diff --git a/openscap.spec b/openscap.spec
index 997ef92..acc310f 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -115,12 +115,15 @@ Requires:       libopenscap%{sover} = %{version}
 This package contains the development files (mainly C header files) for the
 OpenSCAP C library.
 
-%package docker
-Summary:        Docker plugin for OpenSCAP
+%package containers
+Summary:        OpenSCAP plugin for scanning containers
 Group:          System/Libraries
+Provides:       openscap-docker = %{version}-%{release}
+Obsoletes:      openscap-docker < %{version}-%{release}
 
-%description docker
-This package contains the Docker support for OpenSCAP.
+%description containers
+This package contains plugins for scanning containers using OpenSCAP either via
+podman or docker.
 
 %if 0%{?with_bindings}
 %package -n python-openscap
@@ -291,9 +294,12 @@ mv %{buildroot}/%{_prefix}/libexec/oscap-remediate %{buildroot}/%{_bindir}
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
 
-%files docker
+%files containers
 %{python3_sitelib}/oscap_docker_python
 %{_bindir}/oscap-docker
+%{_bindir}/oscap-podman
+%{_mandir}/man8/oscap-podman.8*
+%{_mandir}/man8/oscap-docker.8*
 
 %if 0%{?with_bindings}
 %files -n python-openscap
@@ -316,10 +322,11 @@ mv %{buildroot}/%{_prefix}/libexec/oscap-remediate %{buildroot}/%{_bindir}
 %{_bindir}/oscap-ssh
 %{_bindir}/oscap-chroot
 %{_bindir}/scap-as-rpm
-%{_bindir}/oscap-podman
 %{_bindir}/oscap-run-sce-script
 %{_sbindir}/rcoscap-scan
 %{_datadir}/bash-completion/completions/*
+%exclude %{_mandir}/man8/oscap-podman.8*
+%exclude %{_mandir}/man8/oscap-docker.8*
 %{_bindir}/oscap-remediate-offline
 %{_prefix}/lib/systemd/system/oscap-remediate.service
 %if 0%{?suse_version} != 1599