From 6fef40acf303a26d2f9746faa7be2d2de59826f2 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Dec 23 2014 15:41:57 +0000
Subject: Update to v0.2.0


NVR: flannel-0.2.0-1

- use upstream v0.2.0
- append ${FLANNEL_OPTIONS} to unitfile service start command
- update systemd requirements

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

---

diff --git a/.gitignore b/.gitignore
index 7d1a984..73724f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /flannel-a7b435a.tar.gz
+/v0.2.0.tar.gz
diff --git a/flannel.spec b/flannel.spec
index 394744a..d7357a5 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -4,16 +4,17 @@
 %global project         coreos
 %global repo            flannel
 %global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit          a7b435a9205335db25372bde8c1ff4e522ed3bc7
+%global commit          52c3c4fb51109fdbb09a0d002ac35606f4a773ae
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           flannel 
-Version:        0.1.0
-Release:        8.git%{shortcommit}%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        Etcd address management agent for overlay networks
 License:        ASL 2.0 
 URL:            https://%{import_path}
-Source0:        https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+#Source0:        https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+Source0:        https://%{import_path}/archive/v%{version}.tar.gz
 Source1:        flanneld.service
 Source2:        flanneld.sysconf
 ExclusiveArch:  %{ix86} x86_64 %{arm}
@@ -28,10 +29,10 @@ BuildRequires:      golang(github.com/golang/glog)
 BuildRequires:      golang(github.com/vishvananda/netns)
 BuildRequires:      golang(github.com/vishvananda/netlink)
 BuildRequires:      pkgconfig(systemd)
-Requires:           pkgconfig(systemd)
-Requires(post):     systemd-units
-Requires(preun):    systemd-units
-Requires(postun):   systemd-units
+Requires:           systemd
+Requires(post):     systemd
+Requires(preun):    systemd
+Requires(postun):   systemd
 
 %description
 Flannel is an etcd driven address management agent. Most commonly it is used to
@@ -71,7 +72,7 @@ This package contains library source intended for
 building other packages which use %{project}/%{repo}.
 
 %prep
-%setup -q -n %{repo}-%{commit}
+%setup -q -n %{repo}-%{version}
 %patch0 -p1
 
 %build
@@ -118,6 +119,11 @@ cp -pav {backend,pkg,subnet} %{buildroot}/%{gopath}/src/%{import_path}/
 %{gopath}/src/%{import_path}/
 
 %changelog
+* Tue Dec 23 2014 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.2.0-1
+- update to upstream v0.2.0
+- append FLANNEL_OPTIONS variable to unitfile command
+- systemd-units merged into systemd for fedora18+
+
 * Tue Dec  2 2014 John W. Linville <linville@redhat.com> - 0.1.0-8.gita7b435a
 - Remove patches related to out-of-tree slice backend
 - Update to latest upstream
diff --git a/flanneld.service b/flanneld.service
index 8df5713..0aee4a4 100644
--- a/flanneld.service
+++ b/flanneld.service
@@ -7,7 +7,7 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=/etc/sysconfig/flanneld
-ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY}
+ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY} ${FLANNEL_OPTIONS}
 
 
 [Install]
diff --git a/sources b/sources
index bf928c8..ee8bb2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0607a068952ae51cb6d53a72ce62d21  flannel-a7b435a.tar.gz
+7ff481801c809afb0587412b688f6639  v0.2.0.tar.gz