Accepting request 478793 from Virtualization:containers

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/478793
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/containerd?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2017-03-12 19:05:53 +00:00 committed by Git OBS Bridge
commit 2a1d5d8135
5 changed files with 12 additions and 7 deletions

View File

@ -4,7 +4,7 @@
<param name="scm">git</param> <param name="scm">git</param>
<param name="filename">containerd</param> <param name="filename">containerd</param>
<param name="versionformat">git.%h</param> <param name="versionformat">git.%h</param>
<param name="revision">2a5e70cbf65457815ee76b7e5dd2a01292d9eca8</param> <param name="revision">03e5862ec0d8d3b3f750e19fca3ee367e13c090e</param>
<param name="exclude">.git</param> <param name="exclude">.git</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ceeea27bcbbfbc21fb363407520c4415055a8c2abe284d7247f120d5bf1031e
size 495152

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f15e307be487785e238a94fd99304364259a5099b7a49f6fada70f33c993bd06
size 481888

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 24 18:08:41 UTC 2017 - jmassaguerpla@suse.com
- update to docker 1.13.0 requirement
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 14 06:38:29 UTC 2017 - asarai@suse.com Sat Jan 14 06:38:29 UTC 2017 - asarai@suse.com

View File

@ -39,13 +39,13 @@
%endif %endif
# MANUAL: Update the git_version and git_revision # MANUAL: Update the git_version and git_revision
%define git_version 2a5e70c %define git_version 03e5862
# How to get the git_revision # How to get the git_revision
# git clone https://github.com/docker/containerd.git containerd-upstream # git clone https://github.com/docker/containerd.git containerd-upstream
# cd containerd # cd containerd
# git checkout $git_version # git checkout $git_version
# git_revision=r$(git rev-list HEAD | wc -l) # git_revision=r$(git rev-list HEAD | wc -l)
%define git_revision r569 %define git_revision r608
%define version_unconverted %{git_version} %define version_unconverted %{git_version}
Name: containerd Name: containerd
@ -70,7 +70,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Dockerfile. However, for some reason the Dockerfile for containerd # Dockerfile. However, for some reason the Dockerfile for containerd
# diverges from the one for Docker. As such, this cannot be a hard # diverges from the one for Docker. As such, this cannot be a hard
# requirement (that would break Docker). # requirement (that would break Docker).
Requires: runc = 0.1.1+gitr2819_50a19c6 Requires: runc = 0.1.1+gitr2942_2f7393a
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
%define client ctr %define client ctr