From a43ae7965d58a379975c929a3bd5b31b0b8d348d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 10 2022 07:00:49 +0000 Subject: import containernetworking-plugins-1.0.1-2.module+el8.6.0+14673+621cb8be --- diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec index 18e7402..6b1ca8f 100644 --- a/SPECS/containernetworking-plugins.spec +++ b/SPECS/containernetworking-plugins.spec @@ -17,21 +17,21 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} +Epoch: 1 Name: containernetworking-plugins Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CNI network plugins License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures -#ExclusiveArch: %%{go_arches} -# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4: -# https://bugzilla.redhat.com/show_bug.cgi?id=1905383 -ExcludeArch: %{ix86} -BuildRequires: golang >= 1.12.12-4 +ExclusiveArch: %{go_arches} +BuildRequires: golang >= 1.16.6 BuildRequires: git BuildRequires: go-md2man +BuildRequires: systemd-devel +Requires: systemd Provides: containernetworking-cni = %{version}-%{release} %description @@ -73,6 +73,10 @@ done install -d -p %{buildroot}%{_libexecdir}/cni/ install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni +install -dp %{buildroot}%{_unitdir} +install -p plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir} +install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir} + %check %if 0%{?with_check} # Since we aren't packaging up the vendor directory we need to link @@ -117,9 +121,19 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %doc *.md %dir %{_libexecdir}/cni %{_libexecdir}/cni/* +%{_unitdir}/cni-dhcp.service +%{_unitdir}/cni-dhcp.socket %changelog -* Wed Nov 10 2021 Jindrich Novy - 1.0.1-1 +* Mon Feb 28 2022 Jindrich Novy - 1:1.0.1-2 +- revert back to https://github.com/containernetworking/plugins/releases/tag/v1.0.1 +- Related: #2001445 + +* Mon Feb 28 2022 Jindrich Novy - 1.1.0-1 +- update to https://github.com/containernetworking/plugins/releases/tag/v1.1.0 +- Related: #2001445 + +* Fri Sep 10 2021 Jindrich Novy - 1.0.1-1 - update to https://github.com/containernetworking/plugins/releases/tag/v1.0.1 - Related: #2001445