From 92f94a6630ce3abeaa9af0a3b4f02ed27af41cbe Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Tue, 8 Aug 2023 09:55:55 -0600 Subject: [PATCH] Fix duplicate entries in rpm %files The inclusion of %{_sysconfdir}/warewulf/* and %{_sysconfdir}/warewulf/nodes.conf caused nodes.conf to be listed twice, generating a warning. The inclusion of %{srvdir}/warewulf, which is redundant with %{_sharedstatedir}/warewulf, caused all files in %{_sharedstatedir}/warewulf/overlays to be listed twice, generating a warning. Signed-off-by: Jonathon Anderson --- warewulf.spec.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/warewulf.spec.in b/warewulf.spec.in index fd0c32c0..e0f06208 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -116,14 +116,16 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} %files %defattr(-, root, %{wwgroup}) %dir %{_sysconfdir}/warewulf -%config(noreplace) %{_sysconfdir}/warewulf/* -%config(noreplace) %attr(0640,-,-) %{_sysconfdir}/warewulf/nodes.conf +%config(noreplace) %{_sysconfdir}/warewulf/warewulf.conf +%config(noreplace) %{_sysconfdir}/warewulf/wwapi*.conf +%config(noreplace) %{_sysconfdir}/warewulf/examples +%config(noreplace) %{_sysconfdir}/warewulf/ipxe +%attr(0640,-,-) %{_sysconfdir}/warewulf/nodes.conf %{_sysconfdir}/bash_completion.d/wwctl %dir %{_sharedstatedir}/warewulf %{_sharedstatedir}/warewulf/chroots %{_sharedstatedir}/warewulf/overlays -%{srvdir}/warewulf %attr(-, root, root) %{_bindir}/wwctl %attr(-, root, root) %{_bindir}/wwapi*