diff --git a/.gitignore b/.gitignore index d81d8a9..69b16f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/flannel-a684f4d.tar.gz +/flannel-29ffccc.tar.gz diff --git a/flannel.spec b/flannel.spec index b7342a4..ac64f08 100644 --- a/flannel.spec +++ b/flannel.spec @@ -21,14 +21,14 @@ %global project coreos %global repo flannel %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit a684f4d4620ce201e492f2f66c33ea22eb4f6d47 +%global commit 29ffccc484cd46b6bc2d5a5b9d23e3e2f3f2851c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global devel_main flannel-devel Name: flannel -Version: 0.5.1 -Release: 3%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: Etcd address management agent for overlay networks License: ASL 2.0 URL: https://%{import_path} @@ -44,9 +44,12 @@ BuildRequires: golang >= 1.2.7 BuildRequires: golang(code.google.com/p/goauth2/compute/serviceaccount) BuildRequires: golang(code.google.com/p/google-api-go-client/compute/v1) BuildRequires: golang(code.google.com/p/google-api-go-client/googleapi) -BuildRequires: golang(github.com/coreos/go-etcd/etcd) +BuildRequires: golang(github.com/coreos/etcd/client) +BuildRequires: golang(github.com/coreos/etcd/pkg/transport) +BuildRequires: golang(github.com/coreos/go-iptables/iptables) BuildRequires: golang(github.com/coreos/go-systemd/activation) BuildRequires: golang(github.com/coreos/go-systemd/daemon) >= 2-2 +BuildRequires: golang(github.com/coreos/pkg/flagutil) BuildRequires: golang(github.com/golang/glog) BuildRequires: golang(github.com/gorilla/mux) BuildRequires: golang(github.com/mitchellh/goamz/aws) @@ -70,12 +73,14 @@ that need to communicate with one another. %package devel Summary: %{summary} BuildRequires: golang >= 1.2.7 + BuildRequires: golang(code.google.com/p/goauth2/compute/serviceaccount) BuildRequires: golang(code.google.com/p/google-api-go-client/compute/v1) BuildRequires: golang(code.google.com/p/google-api-go-client/googleapi) -BuildRequires: golang(github.com/coreos/go-etcd/etcd) +BuildRequires: golang(github.com/coreos/etcd/client) +BuildRequires: golang(github.com/coreos/etcd/pkg/transport) +BuildRequires: golang(github.com/coreos/go-iptables/iptables) BuildRequires: golang(github.com/coreos/go-systemd/activation) -BuildRequires: golang(github.com/coreos/go-systemd/daemon) BuildRequires: golang(github.com/golang/glog) BuildRequires: golang(github.com/gorilla/mux) BuildRequires: golang(github.com/mitchellh/goamz/aws) @@ -83,12 +88,14 @@ BuildRequires: golang(github.com/mitchellh/goamz/ec2) BuildRequires: golang(github.com/vishvananda/netlink) BuildRequires: golang(github.com/vishvananda/netlink/nl) BuildRequires: golang(golang.org/x/net/context) + Requires: golang(code.google.com/p/goauth2/compute/serviceaccount) Requires: golang(code.google.com/p/google-api-go-client/compute/v1) Requires: golang(code.google.com/p/google-api-go-client/googleapi) -Requires: golang(github.com/coreos/go-etcd/etcd) +Requires: golang(github.com/coreos/etcd/client) +Requires: golang(github.com/coreos/etcd/pkg/transport) +Requires: golang(github.com/coreos/go-iptables/iptables) Requires: golang(github.com/coreos/go-systemd/activation) -Requires: golang(github.com/coreos/go-systemd/daemon) Requires: golang(github.com/golang/glog) Requires: golang(github.com/gorilla/mux) Requires: golang(github.com/mitchellh/goamz/aws) @@ -96,6 +103,7 @@ Requires: golang(github.com/mitchellh/goamz/ec2) Requires: golang(github.com/vishvananda/netlink) Requires: golang(github.com/vishvananda/netlink/nl) Requires: golang(golang.org/x/net/context) + Provides: golang(%{import_path}/backend) = %{version}-%{release} Provides: golang(%{import_path}/backend/alloc) = %{version}-%{release} Provides: golang(%{import_path}/backend/awsvpc) = %{version}-%{release} @@ -197,6 +205,10 @@ go test %{import_path}/subnet %endif %changelog +* Mon Aug 31 2015 jchaloup - 0.5.3-1 +- Update to 0.5.3 + resolves: #1258876 + * Tue Jul 21 2015 jchaloup - 0.5.1-3 - Change etcd port from 4001 to 2379 - Polish spec file diff --git a/sources b/sources index 159beae..91ea5e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -352b9ef6694237434898437ff3337fd7 flannel-a684f4d.tar.gz +29fa1ee94e1533ddf0517274f643c6c7 flannel-29ffccc.tar.gz