From fd8d986a59586232ba1bf9b6e720bb3cd798fad47993c490cd45aaa83deadea3 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Tue, 14 Mar 2023 09:10:56 +0000 Subject: [PATCH] Remove SLE-12 fix. OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=383 --- docker.changes | 5 ----- docker.spec | 6 ------ 2 files changed, 11 deletions(-) diff --git a/docker.changes b/docker.changes index 93f60b5..01ee29d 100644 --- a/docker.changes +++ b/docker.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Mar 14 07:21:05 UTC 2023 - Aleksa Sarai - -- Fix builds on SLE-12. - ------------------------------------------------------------------- Wed Feb 1 14:33:19 UTC 2023 - Dirk Müller diff --git a/docker.spec b/docker.spec index 06769c8..20ed0bc 100644 --- a/docker.spec +++ b/docker.spec @@ -112,13 +112,7 @@ BuildRequires: go-go-md2man BuildRequires: pkgconfig(libsystemd) BuildRequires: sysuser-tools BuildRequires: golang(API) = 1.18 -%if 0%{?sle_version} == 120000 -# SLE-12's RPM doesn't support binary operations, and this feature isn't needed -# on SLE-12 anyway. -Requires: apparmor-parser -%else Requires: (apparmor-parser or container-selinux) -%endif Requires: ca-certificates-mozilla # The docker-proxy binary used to be in a separate package. We obsolete it, # since now docker-proxy is maintained as part of this package.