From b9a1f3130824c15ce1f137e1c8e5deb62eca05ea Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.com>
Date: Wed, 6 Nov 2024 21:52:58 -0700
Subject: [PATCH] Resolve redundant file entries in warewulf.spec

- Closes #1526

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
---
 warewulf.spec.in | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/warewulf.spec.in b/warewulf.spec.in
index bab49360..dae40912 100644
--- a/warewulf.spec.in
+++ b/warewulf.spec.in
@@ -189,28 +189,27 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup}
 %dir %{_sharedstatedir}/warewulf
 %dir %{_sharedstatedir}/warewulf/chroots
 %dir %{_sharedstatedir}/warewulf/overlays
-%dir %{_sharedstatedir}/warewulf/overlays/NetworkManager
-%dir %{_sharedstatedir}/warewulf/overlays/debian.interfaces
-%dir %{_sharedstatedir}/warewulf/overlays/debug
-%dir %{_sharedstatedir}/warewulf/overlays/fstab
-%dir %{_sharedstatedir}/warewulf/overlays/host
-%dir %{_sharedstatedir}/warewulf/overlays/hostname
-%dir %{_sharedstatedir}/warewulf/overlays/hosts
-%dir %{_sharedstatedir}/warewulf/overlays/ifcfg
-%dir %{_sharedstatedir}/warewulf/overlays/ignition
-%dir %{_sharedstatedir}/warewulf/overlays/issue
-%dir %{_sharedstatedir}/warewulf/overlays/resolv
-%dir %{_sharedstatedir}/warewulf/overlays/ssh.authorized_keys
-%dir %{_sharedstatedir}/warewulf/overlays/ssh.host_keys
-%dir %{_sharedstatedir}/warewulf/overlays/syncuser
-%dir %{_sharedstatedir}/warewulf/overlays/systemd.netname
-%dir %{_sharedstatedir}/warewulf/overlays/udev.netname
-%dir %{_sharedstatedir}/warewulf/overlays/wicked
-%dir %{_sharedstatedir}/warewulf/overlays/wwinit
-%dir %{_sharedstatedir}/warewulf/overlays/wwclient
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/*/rootfs
-%attr(700, root, root) %{_sharedstatedir}/warewulf/overlays/ssh.authorized_keys/rootfs/root
-%attr(700, root, root) %{_sharedstatedir}/warewulf/overlays/ssh.authorized_keys/rootfs/root/.ssh
+%dir %{_sharedstatedir}/warewulf/overlays/*
+%dir %{_sharedstatedir}/warewulf/overlays/*/rootfs
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/NetworkManager/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/debian.interfaces/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/debug/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/fstab/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/host/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/hostname/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/hosts/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/ifcfg/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/ignition/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/issue/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/resolv/rootfs/*
+%attr(700, root, root) %{_sharedstatedir}/warewulf/overlays/ssh.authorized_keys/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/ssh.host_keys/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/syncuser/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/systemd.netname/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/udev.netname/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/wicked/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/wwclient/rootfs/*
+%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/wwinit/rootfs/*
 
 %attr(-, root, root) %{_bindir}/wwctl
 %attr(-, root, root) %{_prefix}/lib/firewalld/services/warewulf.xml