Accepting request 558597 from Virtualization:containers

- Remove the dependency with the cni-plugins
- Recommend the cni-plugins

OBS-URL: https://build.opensuse.org/request/show/558597
OBS-URL: https://build.opensuse.org/package/show/devel:CaaSP:Head:ControllerNode/cni?expand=0&rev=2
This commit is contained in:
Maximilian Meister 2017-12-20 08:20:34 +00:00 committed by Git OBS Bridge
parent e6fb9d7b08
commit f1e178b6b3
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 19 13:04:22 UTC 2017 - alvaro.saurin@suse.com
- Remove the dependency with the cni-plugins
- Recommend the cni-plugins
-------------------------------------------------------------------
Mon Aug 28 15:15:11 UTC 2017 - opensuse-packaging@opensuse.org

View File

@ -32,6 +32,7 @@ BuildRequires: golang-packaging
BuildRequires: shadow
BuildRequires: systemd-rpm-macros
BuildRequires: xz
Recommends: cni-plugins
Requires(post): %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
@ -66,7 +67,7 @@ cp bin/cnitool "%{buildroot}%{_sbindir}/"
# config
install -m 755 -d "%{buildroot}%{cni_etc_dir}"
install -m 755 -d "%{buildroot}%{cni_etc_dir}/net.d"
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{cni_etc_dir}/net.d/99-loopback.conf
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{cni_etc_dir}/net.d/99-loopback.conf.sample
# documentation
install -m 755 -d "%{buildroot}%{cni_doc_dir}"
@ -87,5 +88,4 @@ cp CONTRIBUTING.md README.md LICENSE DCO %{buildroot}%{cni_doc_dir}/
%{cni_etc_dir}/net.d/*
%{_sbindir}/cnitool
%changelog