pool/docker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Emergency fix: %requires_eq does not work with provide symbols,

Browse Source 
only effective package names. Convert back to regular Requires.

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=103
This commit is contained in:
Dominique Leuenberger 2020-06-30 21:02:49 +00:00 committed by Git OBS Bridge
parent ceb470e47f
commit ff3e4df69f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 30 23:00:00 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Emergency fix: %requires_eq does not work with provide symbols,
only effective package names. Convert back to regular Requires.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 25 21:54:46 UTC 2020 - Aleksa Sarai <asarai@suse.com> Thu Jun 25 21:54:46 UTC 2020 - Aleksa Sarai <asarai@suse.com>

6
docker.spec
View File

@ -105,16 +105,16 @@ Requires: ca-certificates-mozilla
# for some old packaging issues (where rpm would delete a binary that was # for some old packaging issues (where rpm would delete a binary that was
# installed by docker-libnetwork). See bsc#1057743 for more details. # installed by docker-libnetwork). See bsc#1057743 for more details.
BuildRequires: docker-libnetwork%{name_suffix}-git = %{required_libnetwork} BuildRequires: docker-libnetwork%{name_suffix}-git = %{required_libnetwork}
%requires_eq docker-libnetwork%{name_suffix}-git Requires: docker-libnetwork%{name_suffix}-git = %{required_libnetwork}
Requires: fix_bsc_1057743 Requires: fix_bsc_1057743
# Containerd and runC are required as they are the only currently supported # Containerd and runC are required as they are the only currently supported
# execdrivers of Docker. NOTE: The version pinning here matches upstream's # execdrivers of Docker. NOTE: The version pinning here matches upstream's
# vendor.conf to ensure that we don't use a slightly incompatible version of # vendor.conf to ensure that we don't use a slightly incompatible version of
# runC or containerd (which would be bad). # runC or containerd (which would be bad).
BuildRequires: containerd%{name_suffix}-git = %{required_containerd} BuildRequires: containerd%{name_suffix}-git = %{required_containerd}
%requires_eq containerd%{name_suffix}-git Requires: containerd%{name_suffix}-git = %{required_containerd}
BuildRequires: docker-runc%{name_suffix}-git = %{required_dockerrunc} BuildRequires: docker-runc%{name_suffix}-git = %{required_dockerrunc}
%requires_eq docker-runc%{name_suffix}-git Requires: docker-runc%{name_suffix}-git = %{required_dockerrunc}
# Needed for --init support. We don't use "tini", we use our own implementation # Needed for --init support. We don't use "tini", we use our own implementation
# which handles edge-cases better. # which handles edge-cases better.
Requires: catatonit Requires: catatonit