From 71b1492013229dc5a05c0f7e812e58455352d77de225e818571665ebdd48c220 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 18 Nov 2019 04:55:57 +0000 Subject: [PATCH 1/2] Accepting request 749163 from home:cyphar:docker - Update to Docker 19.03.5-ce. See upstream changelog in the packaged /usr/share/doc/packages/docker/CHANGELOG.md. OBS-URL: https://build.opensuse.org/request/show/749163 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=326 --- _service | 4 ++-- docker-19.03.4_ce_9013bf583a21.tar.xz | 3 --- docker-19.03.5_ce_633a0ea838f1.tar.xz | 3 +++ docker.changes | 6 ++++++ docker.spec | 10 +++++----- 5 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 docker-19.03.4_ce_9013bf583a21.tar.xz create mode 100644 docker-19.03.5_ce_633a0ea838f1.tar.xz diff --git a/_service b/_service index 715398f..537b749 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ https://github.com/docker/docker-ce.git git .git - 19.03.4_ce_%h - v19.03.4 + 19.03.5_ce_%h + v19.03.5 docker diff --git a/docker-19.03.4_ce_9013bf583a21.tar.xz b/docker-19.03.4_ce_9013bf583a21.tar.xz deleted file mode 100644 index eeaf31f..0000000 --- a/docker-19.03.4_ce_9013bf583a21.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8235fc6b80c925866f54bf43d78734d78095c2db318c95d27ea94ba1d671c7ad -size 10089932 diff --git a/docker-19.03.5_ce_633a0ea838f1.tar.xz b/docker-19.03.5_ce_633a0ea838f1.tar.xz new file mode 100644 index 0000000..5c096b1 --- /dev/null +++ b/docker-19.03.5_ce_633a0ea838f1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a797fea917592f68ff2dfdbef8ff25af9edb1645dcf5e6a8c5003d611948607 +size 10094684 diff --git a/docker.changes b/docker.changes index f11bed6..be051dd 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 18 04:46:31 UTC 2019 - Aleksa Sarai + +- Update to Docker 19.03.5-ce. See upstream changelog in the packaged + /usr/share/doc/packages/docker/CHANGELOG.md. + ------------------------------------------------------------------- Sat Oct 19 11:21:03 UTC 2019 - Aleksa Sarai diff --git a/docker.spec b/docker.spec index 8b073b1..ee81517 100644 --- a/docker.spec +++ b/docker.spec @@ -1,7 +1,7 @@ # # spec file for package docker # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,8 +42,8 @@ # helpfully injects into our build environment from the changelog). If you want # to generate a new git_commit_epoch, use this: # $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s' -%define git_version 9013bf583a21 -%define git_commit_epoch 1571353729 +%define git_version 633a0ea838f1 +%define git_commit_epoch 1573629549 # These are the git commits required. We verify them against the source to make # sure we didn't miss anything important when doing upgrades. @@ -52,12 +52,12 @@ %define required_libnetwork 3eb39382bfa6a3c42f83674ab080ae13b0e34e5d Name: %{realname}%{name_suffix} -Version: 19.03.4_ce +Version: 19.03.5_ce Release: 0 Summary: The Moby-project Linux container runtime License: Apache-2.0 Group: System/Management -Url: http://www.docker.io +URL: http://www.docker.io # TODO(VR): check those SOURCE files below Source: %{realname}-%{version}_%{git_version}.tar.xz Source1: docker.service From 81fa93d82c79f14df7d2ecbf87fd3661cce7abca9ea0f992e1144c7e69f740c0 Mon Sep 17 00:00:00 2001 From: Flavio Castelli Date: Mon, 18 Nov 2019 13:49:09 +0000 Subject: [PATCH 2/2] Accepting request 732529 from home:cbcoutinho:branches:Virtualization:containers - Fix zsh-completion (docker -> _docker) OBS-URL: https://build.opensuse.org/request/show/732529 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=327 --- docker.changes | 5 +++++ docker.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker.changes b/docker.changes index be051dd..d538e46 100644 --- a/docker.changes +++ b/docker.changes @@ -24,6 +24,11 @@ Tue Oct 1 23:54:25 UTC 2019 - Aleksa Sarai - Update to Docker 19.03.2-ce. See upstream changelog in the packaged /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1150397 +------------------------------------------------------------------- +Sun Sep 22 17:41:56 UTC 2019 - Chris Coutinho + +- Fix zsh-completion (docker -> _docker) + ------------------------------------------------------------------- Tue Jul 30 05:14:44 UTC 2019 - Aleksa Sarai diff --git a/docker.spec b/docker.spec index ee81517..7206a88 100644 --- a/docker.spec +++ b/docker.spec @@ -359,7 +359,7 @@ install -Dd -m 0755 \ %{buildroot}%{_sbindir} install -D -m0644 components/cli/contrib/completion/bash/docker "%{buildroot}%{_datarootdir}/bash-completion/completions/%{realname}" -install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{realname}" +install -D -m0644 components/cli/contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/_%{realname}" # # systemd service @@ -476,7 +476,7 @@ grep -q '^dockremap:' /etc/sub{uid,gid} || \ %files zsh-completion %defattr(-,root,root) -%{_sysconfdir}/zsh_completion.d/%{realname} +%{_sysconfdir}/zsh_completion.d/_%{realname} %files test %defattr(-,root,root)