diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec index e42b06b..d59f31c 100644 --- a/SPECS/containernetworking-plugins.spec +++ b/SPECS/containernetworking-plugins.spec @@ -12,7 +12,7 @@ %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 %{?**}; +%define gobuild(o:) GO111MODULE=off 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 @@ -22,18 +22,24 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{import_path} -%global commit0 fe60fcddb897079746ec1523fd1837ab05b1e689 +%global commit0 485be65581341430f9106a194a98f0f2412245fb %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%define built_tag v0.8.7 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url %{git0}/archive/%{built_tag}.tar.gz + Name: %{project}-%{repo} -Version: 0.8.1 +Version: 0.8.7 Release: 1%{?dist} Summary: Libraries for writing CNI plugin License: ASL 2.0 URL: %{git0} -Source0: %{git0}/archive/%{commit0}.tar.gz +Source0: %{download_url} # 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: golang BuildRequires: git BuildRequires: go-md2man @@ -137,7 +143,7 @@ providing packages with %{import_path} prefix. %endif %prep -%autosetup -Sgit -n %{repo}-%{commit0} +%autosetup -Sgit -n %{repo}-%{built_tag_strip} rm -rf plugins/main/windows %build @@ -272,6 +278,38 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Aug 26 2020 RH Container Bot - 0.8.7-1 +- autobuilt v0.8.7 + +* Wed May 13 2020 RH Container Bot - 0.8.6-1 +- autobuilt v0.8.6 + +* Thu Jan 30 2020 Lokesh Mandvekar - 0.8.5-1 +- bump to v0.8.5 + +* Tue Sep 03 2019 Lokesh Mandvekar - 0.8.2-3.git485be65 +- update release tag format + +* Mon Aug 19 2019 Lokesh Mandvekar (Bot) - 0.8.2-2.1.dev.git485be65 +- bump to v0.8.2 +- autobuilt 485be65 + +* Mon Aug 12 2019 Lokesh Mandvekar (Bot) - 0.8.1-5.1.dev.git2d6d4b2 +- autobuilt 2d6d4b2 + +* Wed Aug 07 2019 Lokesh Mandvekar (Bot) - 0.8.1-4.1.dev.gitccd683e +- autobuilt ccd683e + +* Wed Jul 24 2019 Lokesh Mandvekar (Bot) - 0.8.1-3.1.dev.gitded2f17 +- autobuilt ded2f17 + +* Thu Jul 18 2019 Lokesh Mandvekar (Bot) - 0.8.1-2.1.dev.git7ba2bcf +- autobuilt 7ba2bcf + +* Wed Jul 10 2019 Lokesh Mandvekar - 0.8.1-1.1.dev.git966bbcb +- built 966bbcb +- hook up to autobuild + * Fri Jun 07 2019 Lokesh Mandvekar - 0.8.1-1 - bump to v0.8.1