eparis pushed to flannel (master). "Update to v0.3.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 7 14:49:23 UTC 2015
>From effe5893a032f46bfaedf8b226d495b449f54314 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis at redhat.com>
Date: Tue, 7 Apr 2015 10:47:55 -0400
Subject: Update to v0.3.0
diff --git a/.gitignore b/.gitignore
index 3bb238a..afcba97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+/*.src.rpm
/clog
/flannel-a7b435a.tar.gz
/v0.2.0.tar.gz
+/v0.3.0.tar.gz
diff --git a/flannel-remove-third-party-dependency-on-Godeps.patch b/flannel-remove-third-party-dependency-on-Godeps.patch
deleted file mode 100644
index d87c577..0000000
--- a/flannel-remove-third-party-dependency-on-Godeps.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go 2014-12-02 13:44:51.378412184 -0500
-@@ -9,7 +9,7 @@ import (
- "reflect"
- "unsafe"
-
-- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-+ log "github.com/golang/glog"
-
- "github.com/coreos/flannel/pkg/ip"
- )
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go 2014-12-02 13:44:51.378412184 -0500
-@@ -9,8 +9,8 @@ import (
- "sync"
- "syscall"
-
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-+ "github.com/vishvananda/netlink"
-+ log "github.com/golang/glog"
-
- "github.com/coreos/flannel/backend"
- "github.com/coreos/flannel/pkg/ip"
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go 2014-12-02 13:44:51.378412184 -0500
-@@ -7,9 +7,9 @@ import (
- "syscall"
- "time"
-
-- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
-+ log "github.com/golang/glog"
-+ "github.com/vishvananda/netlink"
-+ "github.com/vishvananda/netlink/nl"
-
- "github.com/coreos/flannel/pkg/ip"
- )
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go 2014-12-02 13:44:51.379412195 -0500
-@@ -6,8 +6,8 @@ import (
- "net"
- "sync"
-
-- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-+ log "github.com/golang/glog"
-+ "github.com/vishvananda/netlink"
-
- "github.com/coreos/flannel/backend"
- "github.com/coreos/flannel/subnet"
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go 2014-12-02 13:44:51.379412195 -0500
-@@ -12,8 +12,8 @@ import (
- "syscall"
- "time"
-
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
-- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-+ "github.com/coreos/go-systemd/daemon"
-+ log "github.com/golang/glog"
-
- "github.com/coreos/flannel/backend"
- "github.com/coreos/flannel/pkg/ip"
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go 2014-12-02 13:44:51.380412206 -0500
-@@ -5,7 +5,7 @@ import (
- "net"
- "syscall"
-
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-+ "github.com/vishvananda/netlink"
- )
-
- func GetIfaceIP4Addr(iface *net.Interface) (net.IP, error) {
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go.orig 2014-12-02 13:46:27.648471327 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go 2014-12-02 13:46:35.830561345 -0500
-@@ -3,7 +3,7 @@ package ip
- import (
- "bytes"
- "fmt"
-- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-+ log "github.com/golang/glog"
- "os/exec"
- "regexp"
- "strconv"
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go 2014-12-02 13:44:51.380412206 -0500
-@@ -5,8 +5,8 @@ import (
- "sync"
- "time"
-
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
-- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-+ "github.com/coreos/go-etcd/etcd"
-+ log "github.com/golang/glog"
- )
-
- type subnetRegistry interface {
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go 2014-12-02 13:44:51.381412217 -0500
-@@ -9,8 +9,8 @@ import (
- "strconv"
- "time"
-
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
-- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-+ "github.com/coreos/go-etcd/etcd"
-+ log "github.com/golang/glog"
-
- "github.com/coreos/flannel/pkg/ip"
- "github.com/coreos/flannel/pkg/task"
-diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go
---- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go.orig 2014-11-27 13:43:14.000000000 -0500
-+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go 2014-12-02 13:44:51.381412217 -0500
-@@ -6,7 +6,7 @@ import (
- "testing"
- "time"
-
-- "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
-+ "github.com/coreos/go-etcd/etcd"
-
- "github.com/coreos/flannel/pkg/ip"
- )
diff --git a/flannel.spec b/flannel.spec
index 7dd179a..f30de9e 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 52c3c4fb51109fdbb09a0d002ac35606f4a773ae
+%global commit 25ed9fcb5ac288bd6989bc7ca01d830558a4f46f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: flannel
-Version: 0.2.0
-Release: 7%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
Summary: Etcd address management agent for overlay networks
License: ASL 2.0
URL: https://%{import_path}
@@ -19,15 +19,14 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: flanneld.sysconf
Source2: flanneld.service
Source3: flannel-docker.conf
-Source4: mk-docker-opts.sh
ExclusiveArch: %{ix86} x86_64 %{arm}
-Patch0: flannel-remove-third-party-dependency-on-Godeps.patch
-
BuildRequires: golang >= 1.2.7
BuildRequires: golang-cover
-BuildRequires: golang(github.com/coreos/go-systemd/daemon) >= 2-2
+# 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/vishvananda/netlink)
@@ -45,26 +44,31 @@ that need to communicate with one another.
%package devel
BuildRequires: golang >= 1.2.7
BuildRequires: golang-cover
-BuildRequires: golang(github.com/coreos/go-systemd/daemon) >= 2-2
+# 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/vishvananda/netlink)
-BuildRequires: pkgconfig(systemd)
Requires: golang >= 1.2.7
Requires: golang-cover
-Requires: golang(github.com/coreos/go-systemd/daemon) >= 2-2
+# accidentally missing in golang-github-coreos-go-etcd
+Requires: golang(github.com/coreos/etcd/etcdserver/etcdhttp/httptypes)
Requires: golang(github.com/coreos/go-etcd/etcd)
+Requires: golang(github.com/coreos/go-systemd/daemon) >= 2-2
Requires: golang(github.com/golang/glog)
Requires: golang(github.com/vishvananda/netns)
Requires: golang(github.com/vishvananda/netlink)
Summary: %{summary}
-Provides: golang(%{import_path}/subnet) = %{version}-%{release}
-Provides: golang(%{import_path}/pkg/ip) = %{version}-%{release}
Provides: golang(%{import_path}/backend) = %{version}-%{release}
-Provides: golang(%{import_path}/backend/vxlan) = %{version}-%{release}
-Provides: golang(%{import_path}/backend/udp) = %{version}-%{release}
Provides: golang(%{import_path}/backend/alloc) = %{version}-%{release}
+Provides: golang(%{import_path}/backend/hostgw) = %{version}-%{release}
+Provides: golang(%{import_path}/backend/udp) = %{version}-%{release}
+Provides: golang(%{import_path}/backend/vxlan) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/ip) = %{version}-%{release}
+Provides: golang(%{import_path}/pkg/task) = %{version}-%{release}
+Provides: golang(%{import_path}/subnet) = %{version}-%{release}
%description devel
Flannel is an etcd driven address management agent. Most commonly it is used to
@@ -76,7 +80,10 @@ building other packages which use %{project}/%{repo}.
%prep
%setup -q -n %{repo}-%{version}
-%patch0 -p1
+
+find . -name "*.go" \
+ -print |\
+ xargs sed -i 's/github.com\/coreos\/flannel\/Godeps\/_workspace\/src\///g'
%build
rm -rf Godeps
@@ -97,7 +104,7 @@ install -D -p -m 755 bin/flanneld %{buildroot}%{_bindir}/flanneld
install -D -p -m 644 %{SOURCE1} %{buildroot}/etc/sysconfig/flanneld
install -D -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/flanneld.service
install -D -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/docker.service.d/flannel.conf
-install -D -p -m 755 %{SOURCE4} %{buildroot}%{_libexecdir}/flannel/mk-docker-opts.sh
+install -D -p -m 755 dist/mk-docker-opts.sh %{buildroot}%{_libexecdir}/flannel/mk-docker-opts.sh
# devel package
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
cp -pav {backend,pkg,subnet} %{buildroot}/%{gopath}/src/%{import_path}/
@@ -127,6 +134,9 @@ cp -pav {backend,pkg,subnet} %{buildroot}/%{gopath}/src/%{import_path}/
%{gopath}/src/%{import_path}/
%changelog
+* Tue Apr 7 2015 Eric Paris <eparis at redhat.com> - 0.3.0-1
+- Bump to version 0.3.0
+
* Mon Mar 30 2015 jchaloup <jchaloup at redhat.com> - 0.2.0-7
- Add debug info
related: #1165688
diff --git a/sources b/sources
index ee8bb2c..11120b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ff481801c809afb0587412b688f6639 v0.2.0.tar.gz
+7d77c1bcd866ed85421770e7cdf460b2 v0.3.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/flannel.git/commit/?h=master&id=effe5893a032f46bfaedf8b226d495b449f54314
More information about the scm-commits
mailing list