From 013c77e3961fc3532945a744644749bca1865a6bf9c6b678ba2c65d800ceff68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 25 Feb 2021 15:56:09 +0000 Subject: [PATCH] Accepting request 875072 from home:dmacvicar:branches:devel:languages:python - Reintroduce container runtime requirement accepting both podman and docker. OBS-URL: https://build.opensuse.org/request/show/875072 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docker-compose?expand=0&rev=39 --- python-docker-compose.changes | 6 ++++++ python-docker-compose.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/python-docker-compose.changes b/python-docker-compose.changes index 42e4be4..7cead75 100644 --- a/python-docker-compose.changes +++ b/python-docker-compose.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 25 10:32:51 UTC 2021 - Duncan Mac-Vicar + +- Reintroduce container runtime requirement accepting both podman + and docker. + ------------------------------------------------------------------- Wed Feb 24 12:34:31 UTC 2021 - Duncan Mac-Vicar diff --git a/python-docker-compose.spec b/python-docker-compose.spec index 3097c4f..30ee2ce 100644 --- a/python-docker-compose.spec +++ b/python-docker-compose.spec @@ -42,6 +42,12 @@ BuildRequires: %{python_module texttable >= 0.9.1} BuildRequires: %{python_module websocket-client >= 0.32.0} BuildRequires: fdupes BuildRequires: python-rpm-macros +%if 0%{?suse_version} >= 1500 +Requires: (docker or podman >= 3.0) +Suggests: podman >= 3.0 +%else +Requires: docker +%endif Requires: python-PySocks >= 1.5.6 Requires: python-PyYAML >= 3.10 Requires: python-cached-property >= 1.2.0