|
|
@ -11,6 +11,10 @@ |
|
|
|
%global debug_package %{nil} |
|
|
|
%global debug_package %{nil} |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if ! 0%{?gobuild:1} |
|
|
|
|
|
|
|
%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; |
|
|
|
|
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
%global provider github |
|
|
|
%global provider github |
|
|
|
%global provider_tld com |
|
|
|
%global provider_tld com |
|
|
|
%global project containernetworking |
|
|
|
%global project containernetworking |
|
|
@ -18,19 +22,19 @@ |
|
|
|
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} |
|
|
|
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} |
|
|
|
%global import_path %{provider_prefix} |
|
|
|
%global import_path %{provider_prefix} |
|
|
|
%global git0 https://%{import_path} |
|
|
|
%global git0 https://%{import_path} |
|
|
|
%global commit0 9ebe139e77e82afb122e335328007bca86905ae4 |
|
|
|
%global commit0 fe60fcddb897079746ec1523fd1837ab05b1e689 |
|
|
|
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) |
|
|
|
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) |
|
|
|
|
|
|
|
|
|
|
|
Name: %{project}-%{repo} |
|
|
|
Name: %{project}-%{repo} |
|
|
|
Version: 0.7.4 |
|
|
|
Version: 0.8.1 |
|
|
|
Release: 2%{?dist} |
|
|
|
Release: 1%{?dist} |
|
|
|
Summary: Libraries for writing CNI plugin |
|
|
|
Summary: Libraries for writing CNI plugin |
|
|
|
License: ASL 2.0 |
|
|
|
License: ASL 2.0 |
|
|
|
URL: %{git0} |
|
|
|
URL: %{git0} |
|
|
|
Source0: %{git0}/archive/%{commit0}.tar.gz |
|
|
|
Source0: %{git0}/archive/%{commit0}.tar.gz |
|
|
|
#ExcludeArch: ppc64 |
|
|
|
|
|
|
|
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. |
|
|
|
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. |
|
|
|
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} |
|
|
|
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} |
|
|
|
|
|
|
|
BuildRequires: git |
|
|
|
BuildRequires: go-md2man |
|
|
|
BuildRequires: go-md2man |
|
|
|
|
|
|
|
|
|
|
|
%if ! 0%{?with_bundled} |
|
|
|
%if ! 0%{?with_bundled} |
|
|
@ -134,6 +138,7 @@ providing packages with %{import_path} prefix. |
|
|
|
|
|
|
|
|
|
|
|
%prep |
|
|
|
%prep |
|
|
|
%autosetup -Sgit -n %{repo}-%{commit0} |
|
|
|
%autosetup -Sgit -n %{repo}-%{commit0} |
|
|
|
|
|
|
|
rm -rf plugins/main/windows |
|
|
|
|
|
|
|
|
|
|
|
%build |
|
|
|
%build |
|
|
|
export ORG_PATH="%{provider}.%{provider_tld}/%{project}" |
|
|
|
export ORG_PATH="%{provider}.%{provider_tld}/%{project}" |
|
|
@ -267,6 +272,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
%changelog |
|
|
|
%changelog |
|
|
|
|
|
|
|
* Fri Jun 07 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.8.1-1 |
|
|
|
|
|
|
|
- bump to v0.8.1 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri May 31 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0.7.5-1 |
|
|
|
|
|
|
|
- Resolves: #1715758 - CVE-2019-9946 |
|
|
|
|
|
|
|
- bump to v0.7.5 |
|
|
|
|
|
|
|
- BR: git |
|
|
|
|
|
|
|
- remove ExcludeArch: ppc64 |
|
|
|
|
|
|
|
|
|
|
|
* Wed Feb 27 2019 Jason Brooks <jbrooks@redhat.com> - 0.7.4-2 |
|
|
|
* Wed Feb 27 2019 Jason Brooks <jbrooks@redhat.com> - 0.7.4-2 |
|
|
|
- add Provides kubernetes-cni for compatibility with upstream kubelet package |
|
|
|
- add Provides kubernetes-cni for compatibility with upstream kubelet package |
|
|
|
|
|
|
|
|
|
|
|