From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 15 Oct 2020 09:21:00 +0000 (+0200)
Subject: Revert "spec: Podman (temporarily) requires apparmor-abstractions on suse"
X-Git-Tag: v15.2.9~122^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7c4b2c7f878ac03cb4a1bb03cf6debff354ff12;p=ceph.git

Revert "spec: Podman (temporarily) requires apparmor-abstractions on suse"

This reverts commit 070e5c3e35ea476815ff9fa4f71aed147fe1ea79.

This commit was working around a bug that was present in old (pre-1.8.0)
versions of podman. Since we are no longer running cephadm with versions
that old, we can safely drop this workaround.

Fixes: https://tracker.ceph.com/issues/47862
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit b8168d9e8ad0927e0d6a291a1b23a2fdf1992089)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 70942aca73bb..d2e8c8ffdc87 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -415,9 +415,6 @@ Base is the package that includes all the files shared amongst ceph servers
 %package -n cephadm
 Summary:        Utility to bootstrap Ceph clusters
 Requires:       lvm2
-%if 0%{?suse_version}
-Requires:       apparmor-abstractions
-%endif
 Requires:       python%{python3_pkgversion}
 %if 0%{?weak_deps}
 Recommends:     podman