From b57915f47b59e6d11697ee33d79ce0b7ddc2b56a6f1e877ffcb015f6a4113d0a Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Thu, 6 Jun 2019 14:01:48 +0000
Subject: [PATCH] Accepting request 708155 from home:kukuk:container

- Fix path of flanneld in yaml file
- Cleanup filelist

OBS-URL: https://build.opensuse.org/request/show/708155
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/flannel?expand=0&rev=2
---
 flannel.changes |  6 ++++++
 flannel.spec    | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flannel.changes b/flannel.changes
index b54dd13..0f4321e 100644
--- a/flannel.changes
+++ b/flannel.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  6 15:57:32 CEST 2019 - kukuk@suse.de
+
+- Fix path of flanneld in yaml file
+- Cleanup filelist
+
 -------------------------------------------------------------------
 Tue Apr  9 11:45:05 CEST 2019 - kukuk@suse.de
 
diff --git a/flannel.spec b/flannel.spec
index 34fd6d3..6bc1715 100644
--- a/flannel.spec
+++ b/flannel.spec
@@ -82,10 +82,8 @@ rm -rf %{buildroot}/%{_libdir}/go/contrib
 # Install provided yaml file to download and run the flannel container
 mkdir -p %{buildroot}%{_datadir}/k8s-yaml/flannel
 install -m 0644 Documentation/kube-flannel.yml %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml
-sed -i -e 's|image: quay.io/coreos/flannel:.*|image: registry.opensuse.org/home/kukuk/container/container/kubic/flannel:%{version}|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml
-
-# Additional
-install -D -p -m 0755 dist/mk-docker-opts.sh %{buildroot}%{_libexecdir}/flannel/mk-docker-opts.sh
+sed -i -e 's|image: quay.io/coreos/flannel:.*|image: registry.opensuse.org/devel/kubic/containers/container/kubic/flannel:%{version}|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml
+sed -i -e 's|/opt/bin/flanneld|/usr/sbin/flanneld|g' %{buildroot}%{_datadir}/k8s-yaml/flannel/kube-flannel.yaml
 
 # Move
 mkdir -p %{buildroot}%{_sbindir}
@@ -97,10 +95,6 @@ mv %{buildroot}%{_bindir}/flannel %{buildroot}%{_sbindir}/flanneld
 %license LICENSE
 %{_sbindir}/flanneld
 
-# Additional
-%dir %{_libexecdir}/flannel
-%{_libexecdir}/flannel/mk-docker-opts.sh
-
 %files k8s-yaml
 %dir %{_datarootdir}/k8s-yaml
 %dir %{_datarootdir}/k8s-yaml/flannel