From 6fd42af8153077164496cea1a856d8407e2c1a0f Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Sep 30 2020 00:08:24 +0000 Subject: Use gnostic compat package Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index 865a777..34096ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cli-runtime-kubernetes-1.13.7-beta.0.tar.gz /cli-runtime-kubernetes-1.15.0.tar.gz /cli-runtime-kubernetes-1.18.3.tar.gz +/cli-runtime-kubernetes-1.18.9.tar.gz diff --git a/golang-k8s-cli-runtime.spec b/golang-k8s-cli-runtime.spec index 5ad350b..337742e 100644 --- a/golang-k8s-cli-runtime.spec +++ b/golang-k8s-cli-runtime.spec @@ -4,8 +4,8 @@ # https://github.com/kubernetes/cli-runtime %global goipath k8s.io/cli-runtime %global forgeurl https://github.com/kubernetes/cli-runtime -Version: 1.18.3 -%global tag kubernetes-1.18.3 +Version: 1.18.9 +%global tag kubernetes-1.18.9 %global distprefix %{nil} %gometa @@ -17,7 +17,7 @@ Set of helpers for creating kubectl commands, as well as kubectl plugins.} %global godocs README.md code-of-conduct.md CONTRIBUTING.md Name: %{goname} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Set of helpers for creating kubectl commands and plugins # Upstream license specification: Apache-2.0 @@ -26,7 +26,7 @@ URL: %{gourl} Source0: %{gosource} BuildRequires: golang(github.com/evanphx/json-patch) -BuildRequires: golang(github.com/googleapis/gnostic/openapiv2) +BuildRequires: golang(github.com/googleapis/gnostic-0.4/openapiv2) BuildRequires: golang(github.com/liggitt/tabwriter) BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/spf13/cobra) @@ -105,6 +105,7 @@ BuildRequires: golang(sigs.k8s.io/kustomize/pkg/resid) %prep %goprep sed -i "s|github.com/googleapis/gnostic/OpenAPIv2|github.com/googleapis/gnostic/openapiv2|" $(find . -type f -iname "*.go") +sed -i 's|github.com/googleapis/gnostic|github.com/googleapis/gnostic-0.4|' $(find . -iname "*.go" -type f) %install %gopkginstall @@ -117,6 +118,9 @@ sed -i "s|github.com/googleapis/gnostic/OpenAPIv2|github.com/googleapis/gnostic/ %gopkgfiles %changelog +* Wed Aug 19 17:56:57 CEST 2020 Robert-André Mauchin - 1.18.3-5 +- Use gnostic compat package + * Mon Jul 27 2020 Fedora Release Engineering - 1.18.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 11e15a0..78eac92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cli-runtime-kubernetes-1.18.3.tar.gz) = 144bc14757719928ad9dc84efadde9ce77568ac63a12f868c16fbf614cb5572538cd7232690d57c0eca67cc3fef554cf733faca2e3cd1040eb6cbae1dd4ecbfe +SHA512 (cli-runtime-kubernetes-1.18.9.tar.gz) = b382de852654e0a3a6572b4247ebf198f2f60910b84ac9a9dc9461361b53b56e511c6575acccf9f4bd21a4764fe20792988ca6b9132e36d3346bf6a95aa2b9b8