Hello community, here is the log from the commit of package containerd_2a5e70c for openSUSE:Factory checked in at 2017-11-30 12:45:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerd_2a5e70c (Old) and /work/SRC/openSUSE:Factory/.containerd_2a5e70c.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "containerd_2a5e70c" Thu Nov 30 12:45:09 2017 rev:2 rq:546261 version:0.2.5+gitr569_2a5e70c Changes: -------- --- /work/SRC/openSUSE:Factory/containerd_2a5e70c/containerd_2a5e70c.changes 2017-09-15 21:03:36.052604129 +0200 +++ /work/SRC/openSUSE:Factory/.containerd_2a5e70c.new/containerd_2a5e70c.changes 2017-11-30 12:45:10.402394311 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:48:23 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerd_2a5e70c.spec ++++++ --- /var/tmp/diff_new_pack.x2AydX/_old 2017-11-30 12:45:11.290362030 +0100 +++ /var/tmp/diff_new_pack.x2AydX/_new 2017-11-30 12:45:11.294361885 +0100 @@ -1,5 +1,5 @@ # -# spec file for package containerd +# spec file for package containerd_2a5e70c # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + # Check if go_arches is defined in the project configuration # Otherwise, define it here # In order to define it in the project configuration, see @@ -65,7 +70,7 @@ %else BuildRequires: gcc6-go >= 6.1 %endif -BuildRoot: %{_tmppath}/%{_name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build # Currently runC is the only supported runtime for containerd. NOTE: # This version pinning is done to follow (as well as we can) upstream's # Dockerfile. However, for some reason the Dockerfile for containerd @@ -155,7 +160,7 @@ %{__install} -D -m644 %SOURCE1 %{buildroot}/%{_unitdir}/%{_name}.service %{__install} -D -m644 %SOURCE2 %{buildroot}/%{_unitdir}/%{_name}.socket ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rccontainerd -%{__install} -D -m644 %SOURCE3 %{buildroot}/var/adm/fillup-templates/sysconfig.%{_name} +%{__install} -D -m644 %SOURCE3 %{buildroot}%{_fillupdir}/sysconfig.%{_name} install -d -m755 %{buildroot}/usr/src/containerd/ cp -avr $HOME/go/src/github.com/docker/containerd/* %{buildroot}/usr/src/containerd/ @@ -180,7 +185,7 @@ %{_sbindir}/%{shim} %{_unitdir}/%{_name}.service %{_unitdir}/%{_name}.socket -/var/adm/fillup-templates/sysconfig.%{_name} +%{_fillupdir}/sysconfig.%{_name} %{_sbindir}/rccontainerd %files ctr