From 7df98e9f1683752ec3ad69964cc94890b4a6d446a5ab8252db82e8071cd8df78 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 29 Aug 2017 09:47:36 +0000 Subject: [PATCH] Accepting request 519287 from Virtualization:containers - build with go1.8 explicitly this fixes the golang.org/x/net/context conflict when building it in our devel projects for casp OBS-URL: https://build.opensuse.org/request/show/519287 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flannel?expand=0&rev=6 --- flannel.changes | 6 ++++++ flannel.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/flannel.changes b/flannel.changes index f9b372b..4b8906c 100644 --- a/flannel.changes +++ b/flannel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 29 08:27:54 UTC 2017 - mmeister@suse.com + +- build with go1.8 + this fixes the golang.org/x/net/context conflict + ------------------------------------------------------------------- Thu Aug 24 07:56:44 UTC 2017 - vrothberg@suse.com diff --git a/flannel.spec b/flannel.spec index 2119066..53951bc 100644 --- a/flannel.spec +++ b/flannel.spec @@ -31,6 +31,7 @@ Source4: flannel-tmpfiles.conf BuildRequires: golang-packaging BuildRequires: systemd BuildRequires: xz +BuildRequires: golang(API) = 1.8 Requires(post): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %{go_nostrip}