From b555443b828c1093d59de9ecb2c17cea695a7ada Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 3 Sep 2021 11:26:49 +0200 Subject: [PATCH] containernetworking-plugins-1.0.0-1.el9 - add systemd dependencies - Related: #2000051 Signed-off-by: Jindrich Novy --- containernetworking-plugins.spec | 18 +++++++++++++++--- sources | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec index 01c820d..bad92ff 100644 --- a/containernetworking-plugins.spec +++ b/containernetworking-plugins.spec @@ -21,17 +21,19 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL %global import_path %{provider_prefix} Name: containernetworking-plugins -Version: 0.9.1 -Release: 4%{?dist} +Version: 1.0.0 +Release: 1%{?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} -BuildRequires: golang >= 1.12.12-4 +BuildRequires: golang >= 1.16.6 BuildRequires: git BuildRequires: go-md2man +BuildRequires: systemd-devel +Requires: systemd Provides: containernetworking-cni = %{version}-%{release} %description @@ -73,6 +75,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,8 +123,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %doc *.md %dir %{_libexecdir}/cni %{_libexecdir}/cni/* +%{_unitdir}/cni-dhcp.service +%{_unitdir}/cni-dhcp.socket %changelog +* Fri Sep 03 2021 Jindrich Novy - 1.0.0-1 +- add systemd dependencies +- Related: #2000051 + * Mon Aug 09 2021 Mohan Boddu - 0.9.1-4 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index 39d17dd..4debf24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.9.1.tar.gz) = 24e8fcedbff2ae7a83aa96085b546b164de6a0884d593e3b5386e9d2de3c4d9a215db9e9405332020cc45c371709a32b600e263e4f8dee62c51adafdc0180f24 +SHA512 (v1.0.0.tar.gz) = daf820bc0ce0278e0dd5782f29b5302c880ab6cbbe2dc0b043948ab2c8213e63374914fa85a74edcbc89d1632006a92bf7b1ba004defbd6a6df3dcecfdefdfb3