From c972e7bba2f40513539840b93d6b1d133d64f3e234b12917d18dd6cd6b0401ee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 6 Aug 2020 15:30:11 +0000 Subject: [PATCH] Accepting request 824277 from devel:kubic OBS-URL: https://build.opensuse.org/request/show/824277 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=27 --- containers.conf | 2 +- libcontainers-common.changes | 5 +++++ libcontainers-common.spec | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/containers.conf b/containers.conf index 53c7d26..9a042c5 100644 --- a/containers.conf +++ b/containers.conf @@ -241,7 +241,7 @@ init_path = "/usr/bin/catatonit" # Path to directory where CNI plugin binaries are located. # -cni_plugin_dirs = ["/usr/lib/cni"] +cni_plugin_dirs = ["@LIBEXECDIR@/cni"] # Path to the directory where CNI configuration files are located. # diff --git a/libcontainers-common.changes b/libcontainers-common.changes index 2e7027d..fc00524 100644 --- a/libcontainers-common.changes +++ b/libcontainers-common.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 3 17:10:46 UTC 2020 - Callum Farmer + +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) + ------------------------------------------------------------------- Tue Jul 28 13:22:02 UTC 2020 - Ralf Haferkamp diff --git a/libcontainers-common.spec b/libcontainers-common.spec index 0d14cce..75c0898 100644 --- a/libcontainers-common.spec +++ b/libcontainers-common.spec @@ -111,6 +111,7 @@ install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf install -D -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/containers/mounts.conf install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/containers/registries.conf install -D -m 0644 %{SOURCE8} %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml +sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE10} install -D -m 0644 %{SOURCE10} %{buildroot}/%{_datadir}/containers/containers.conf install -D -m 0644 podman-%{podmanver}/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json install -D -m 0644 podman-%{podmanver}/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json