From bf16296ce4be80f3c9f64dd1d2e599f9731d525d Mon Sep 17 00:00:00 2001
From: Christophe de Dinechin <dinechin@redhat.com>
Date: Sep 27 2019 16:55:28 +0000
Subject: Update to kata-proxy 1.8.2


And many spec updates

---

diff --git a/kata-proxy.spec b/kata-proxy.spec
index 679507c..818a5fc 100644
--- a/kata-proxy.spec
+++ b/kata-proxy.spec
@@ -1,30 +1,23 @@
-%global with_debug 1
-
-%global provider github
-%global provider_tld com
-%global project kata-containers
-%global repo proxy
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global git0 https://%{import_path}
-%global commit0 6553b8382e7f17e7ae7ecb5d8801ec9bf6ffc00e
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
-%if 0%{with_debug}
-%global _find_debuginfo_dwz_opts %{nil}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif # with_debug
-
-Name: kata-%{repo}
-Version: 1.4.1
-Release: 3.git%{shortcommit0}%{?dist}
-URL: %{git0}
-Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-BuildRequires: git
-Summary: Kata proxy
-License: ASL 2.0
+%global domain          github.com
+%global org             kata-containers
+%global repo            proxy
+%global download        %{domain}/%{org}/%{repo}
+%global importname      %{download}
+
+# Find debug informations from a go build (will be better in F31)
+%global gobuild go build -ldflags=-linkmode=external
+
+Name:      kata-%{repo}
+Version:   1.8.2
+Release:   1%{?dist}
+Url:       https://%{download}
+Source0:   https://%{download}/archive/%{version}/%{name}-%{version}.tar.gz
+Summary:   Proxy for Kata Containers
+Group:     Development/Tools
+License:   ASL 2.0
+
+# F31: Add BuildRequires: go-rpm-macros
+BuildRequires: %{?suse_version:go1.12} %{!?suse_version:golang}
 
 Provides: bundled(golang(github.com/davecgh/go-spew)) = v1.1.0
 Provides: bundled(golang(github.com/hashicorp/yamux)) = f5742cb6
@@ -35,27 +28,42 @@ Provides: bundled(golang(golang.org/x/crypto)) = 13931e22f9e72ea58bb73048bc752b4
 Provides: bundled(golang(golang.org/x/sys)) = 810d7000345868fc619eb81f46307107118f4ae1
 
 %description
-%{summary}
+A proxy for the Kata Containers project
+
+The Kata Containers runtime creates a virtual machine (VM) to isolate
+a set of container workloads. The VM requires a guest kernel and a
+guest operating system ("guest OS") to boot and create containers
+inside the guest environment. This package contains the tools to create
+guest OS images.
+
+The kata-proxy is part of the Kata Containers project. For more
+information on how the proxy fits into the Kata Containers
+architecture, refer to the Kata Containers architecture documentation.
 
 %prep
-%autosetup -Sgit -n %{repo}-%{commit0}
+%autosetup -n %{repo}-%{version}
 
 %build
-mkdir _build
-pushd _build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
-ln -s $(dirs +1 -l) src/%{import_path}
-popd
+# Adjust for go build requirements
+# Future: Use %gopkginstall
+# export GOROOT="$(pwd)/go"
+export GOPATH="$(pwd)/go"
+
+mkdir go
+mv vendor go/src
+mkdir -p go/src/%{domain}/%{org}
+ln -s $(pwd)/../%{repo}-%{version} go/src/%{importname}
+cd go/src/%{importname}
 
-mv vendor src
-export GOPATH=$(pwd)/_build:$(pwd)
-%gobuild -o bin/%{name} %{import_path}
+%gobuild -o bin/%{name} %{importname}
 
 %install
 # install binaries
 install -dp %{buildroot}%{_libexecdir}/kata-containers
 install -p -m 755 bin/%{name} %{buildroot}%{_libexecdir}/kata-containers
 
+%clean
+
 %files
 %license LICENSE
 %doc CODE_OF_CONDUCT.md CONTRIBUTING.md README.md
@@ -63,15 +71,8 @@ install -p -m 755 bin/%{name} %{buildroot}%{_libexecdir}/kata-containers
 %{_libexecdir}/kata-containers/%{name}
 
 %changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-3.git6553b83
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2.git6553b83
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 13 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.4.1-1.git6553b83
-- Resolves: #1590423 - first build for Fedora
-- bump to v1.4.1
+* Fri Sep 20 2019 Christophe de Dinechin <dinechin@redhat.com> - 1.8.2-1
+- Update to 1.8.2 release
 
 * Wed Nov 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.3.1-5.gitd364b2e
 - build for all arches