From 8f9719a1e3d7c9758024ca11465511c2d0fde0be Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Sat, 5 Mar 2022 08:22:30 -0800 Subject: [PATCH 1/3] Fixing RPM build error caused by #301 (ref #305) --- warewulf.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/warewulf.spec.in b/warewulf.spec.in index e5e53a84..dc95de70 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -108,7 +108,7 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} %attr(-, root, root) %{_unitdir}/warewulfd.service %attr(-, root, root) %{_mandir}/man1/wwctl* -%attr(-, root, root) /var/lib/tftpboot/warewulf +%attr(-, root, root) %{tftpdir}/warewulf %changelog * Sat Jan 15 2022 Gregory Kurtzer - 4.2.0-1 From f760ded5cd7db2f2a46564c78c9348cd9565ca01 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Sat, 5 Mar 2022 08:25:33 -0800 Subject: [PATCH 2/3] Clean warewulf.spec --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8542d3e7..72b98588 100644 --- a/Makefile +++ b/Makefile @@ -232,7 +232,7 @@ clean: rm -f man_page rm -rf man_pages rm -rf vendor -# rm -f config_defaults + rm -f warewulf.spec rm -f config rm -f Defaults.mk From 1c088faddad2226c1c432025105f9dfde1d54af7 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Sat, 5 Mar 2022 08:29:49 -0800 Subject: [PATCH 3/3] Fixed rpmbuild --- warewulf.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/warewulf.spec.in b/warewulf.spec.in index dc95de70..e80b03c5 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -107,8 +107,7 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} %attr(-, root, root) %{_prefix}/lib/firewalld/services/warewulf.xml %attr(-, root, root) %{_unitdir}/warewulfd.service %attr(-, root, root) %{_mandir}/man1/wwctl* - -%attr(-, root, root) %{tftpdir}/warewulf +%attr(-, root, root) %{_datadir}/warewulf %changelog * Sat Jan 15 2022 Gregory Kurtzer - 4.2.0-1