jchaloup pushed to flannel (master). "Bump to upstream 9180d9a37e2ae6d7fceabea51c6416767c6b50f6 (..more)"

[notifications at fedoraproject.org]

From de2654baffc45683de79cbc6fd962266f6f9f41b Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri, 22 May 2015 09:37:11 +0200
Subject: Bump to upstream 9180d9a37e2ae6d7fceabea51c6416767c6b50f6 - related:
 #1223445


diff --git a/.gitignore b/.gitignore
index a9643b6..c99627d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/flannel-4ab27dd.tar.gz
+/flannel-9180d9a.tar.gz
diff --git a/flannel.spec b/flannel.spec
index f97bc00..26ead87 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -5,12 +5,12 @@
 %global project         coreos
 %global repo            flannel
 %global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit          4ab27ddd3e87eb2daf152513c0b1dc22879393a8
+%global commit          9180d9a37e2ae6d7fceabea51c6416767c6b50f6
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           flannel 
 Version:        0.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Etcd address management agent for overlay networks
 License:        ASL 2.0 
 URL:            https://%{import_path}
@@ -24,13 +24,15 @@ ExclusiveArch:  %{ix86} x86_64 %{arm}
 BuildRequires:      golang >= 1.2.7
 %if 0%{?fedora}
 BuildRequires:      golang-cover
-# accidentally missing in golang-github-coreos-go-etcd
-BuildRequires:      golang(github.com/coreos/etcd/etcdserver/etcdhttp/httptypes)
 BuildRequires:      golang(github.com/coreos/go-etcd/etcd)
 BuildRequires:      golang(github.com/coreos/go-systemd/daemon) >= 2-2
 BuildRequires:      golang(github.com/golang/glog)
-BuildRequires:      golang(github.com/vishvananda/netns)
+BuildRequires:      golang(github.com/gorilla/mux)
+BuildRequires:      golang(github.com/mitchellh/goamz/aws)
+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)
 %endif
 BuildRequires:      pkgconfig(systemd)
 Requires:           systemd
@@ -51,6 +53,7 @@ BuildRequires: golang-cover
 BuildRequires: golang(github.com/coreos/go-etcd/etcd)
 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)
 BuildRequires: golang(github.com/mitchellh/goamz/ec2)
 BuildRequires: golang(github.com/vishvananda/netlink)
@@ -73,6 +76,7 @@ Provides: golang(%{import_path}/backend/udp) = %{version}-%{release}
 Provides: golang(%{import_path}/backend/vxlan) = %{version}-%{release}
 Provides: golang(%{import_path}/network) = %{version}-%{release}
 Provides: golang(%{import_path}/pkg/ip) = %{version}-%{release}
+Provides: golang(%{import_path}/remote) = %{version}-%{release}
 Provides: golang(%{import_path}/subnet) = %{version}-%{release}
 
 %description devel
@@ -148,6 +152,10 @@ cp -pav {backend,pkg,subnet} %{buildroot}/%{gopath}/src/%{import_path}/
 %endif
 
 %changelog
+* Fri May 22 2015 jchaloup <jchaloup at redhat.com> - 0.4.1-2
+- Bump to upstream 9180d9a37e2ae6d7fceabea51c6416767c6b50f6
+  related: #1223445
+
 * Wed May 20 2015 jchaloup <jchaloup at redhat.com> - 0.4.1-1
 - Bump to upstream 4ab27ddd3e87eb2daf152513c0b1dc22879393a8
   resolves: #1223445
diff --git a/sources b/sources
index c3e5751..9537398 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8a35626e9d61a5a787b387e90cd0c80  flannel-4ab27dd.tar.gz
+65cb2c17d1214c02de07574b683df278  flannel-9180d9a.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/flannel.git/commit/?h=master&id=de2654baffc45683de79cbc6fd962266f6f9f41b