From 450c4fe91a6c787a0c0b922845118ab1c9caff8862571a14b304aa72269dcbd2 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Fri, 19 Jan 2018 08:07:52 +0000 Subject: [PATCH 1/2] Accepting request 567583 from home:vrothberg:branches:Virtualization:containers - Remove requirement on bridge-utils, which has been replaced by libnetwork in Docker. bsc#1072798 OBS-URL: https://build.opensuse.org/request/show/567583 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=232 --- docker.changes | 7 +++++++ docker.spec | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker.changes b/docker.changes index 5d3f284..af088c6 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 19 07:48:10 UTC 2018 - vrothberg@suse.com + +- Remove requirement on bridge-utils, which has been replaced by libnetwork in + Docker. + bsc#1072798 + ------------------------------------------------------------------- Mon Dec 18 12:32:35 UTC 2017 - asarai@suse.com diff --git a/docker.spec b/docker.spec index 7eb3a1f..8fa81ee 100644 --- a/docker.spec +++ b/docker.spec @@ -94,7 +94,6 @@ BuildRequires: sqlite3-devel BuildRequires: systemd-devel BuildRequires: zsh Requires: apparmor-parser -Requires: bridge-utils Requires: ca-certificates-mozilla # Required in order for networking to work. fix_bsc_1057743 is a work-around # for some old packaging issues (where rpm would delete a binary that was From 6643e811f1fed75a1baaef327ab91c297b6a4fc9e676b0f8316edce2da5c5032 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Fri, 19 Jan 2018 15:22:50 +0000 Subject: [PATCH 2/2] Accepting request 567735 from home:cyphar:containers:docker_obsoletes_image-migrator - Add Obsoletes: docker-image-migrator, as the tool is no longer needed and we've pretty much removed it from everywhere except the containers module. bsc#1069758 OBS-URL: https://build.opensuse.org/request/show/567735 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=233 --- docker.changes | 10 ++++++++-- docker.spec | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docker.changes b/docker.changes index af088c6..e9358e8 100644 --- a/docker.changes +++ b/docker.changes @@ -1,9 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 19 14:12:32 UTC 2018 - asarai@suse.com + +- Add Obsoletes: docker-image-migrator, as the tool is no longer needed and + we've pretty much removed it from everywhere except the containers module. + bsc#1069758 + ------------------------------------------------------------------- Fri Jan 19 07:48:10 UTC 2018 - vrothberg@suse.com - Remove requirement on bridge-utils, which has been replaced by libnetwork in - Docker. - bsc#1072798 + Docker. bsc#1072798 ------------------------------------------------------------------- Mon Dec 18 12:32:35 UTC 2017 - asarai@suse.com diff --git a/docker.spec b/docker.spec index 8fa81ee..c0efd7e 100644 --- a/docker.spec +++ b/docker.spec @@ -117,6 +117,9 @@ Requires: xz >= 4.9 Requires(post): %fillup_prereq Requires(post): udev Requires(post): shadow +# We used to have a migration tool for the upgrade from v1.9.x to v1.10.x. +# It is no longer useful, so we obsolete it. bsc#1069758 +Obsoletes: docker-image-migrator # Not necessary, but must be installed when the underlying system is # configured to use lvm and the user doesn't explicitly provide a # different storage-driver than devicemapper