From 6ef967f032540bcb9b8ff0c4393ab77faabe17d90c77961c35cd845de921d37c Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 4 Jan 2018 05:13:12 +0000 Subject: [PATCH] Accepting request 560090 from home:dimstar:Factory - Fix build with RPM 4.14: exclude is not meant for files to NOT be packaged, but should only be used if the files are to be excluded from a glob when they end up in a different package. Rather remove the unwanted files in the install section. OBS-URL: https://build.opensuse.org/request/show/560090 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=68 --- containerd.changes | 8 ++++++++ containerd.spec | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/containerd.changes b/containerd.changes index 8092e9c..7aad036 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 27 11:15:36 UTC 2017 - dimstar@opensuse.org + +- Fix build with RPM 4.14: exclude is not meant for files to NOT be + packaged, but should only be used if the files are to be excluded + from a glob when they end up in a different package. Rather + remove the unwanted files in the install section. + ------------------------------------------------------------------- Mon Dec 11 12:30:31 UTC 2017 - asarai@suse.com diff --git a/containerd.spec b/containerd.spec index 5713d26..6decf69 100644 --- a/containerd.spec +++ b/containerd.spec @@ -130,6 +130,8 @@ install -D -m644 %SOURCE3 %{buildroot}%{_fillupdir}/sysconfig.%{name} install -d -m755 %{buildroot}/usr/src/containerd/ cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/containerd/ +# remove files we don't want to ship - exclude is the wrong usage here +rm -rf %{buildroot}/usr/src/containerd/bin %fdupes %{buildroot} @@ -162,6 +164,5 @@ cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/cont %files test %defattr(-,root,root) /usr/src/containerd/ -%exclude /usr/src/containerd/bin %changelog