From f400f01eb3f60f5d353bb5bedc61f8f9450cdbbb Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Sat, 10 Jan 2009 19:14:05 +0000
Subject: [PATCH] - Make sure all /etc/dhcp config files are marked in the
 manifest - Include new config file directies in the dhcp and dhclient
 packages - Do not overwrite new config files if they already exist

---
 dhcp.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dhcp.spec b/dhcp.spec
index c5ff017..bfc6d45 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -258,7 +258,7 @@ CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE -DLDAP_CONFIGURATION -DUSE_SSL" \
 
 # Remove files we don't want
 %{__rm} -f %{buildroot}%{_sysconfdir}/dhclient.conf
-%{__rm} -f %{buildroot}%{_sysconfdir}/dhcp/dhclient.conf
+%{__rm} -f %{buildroot}%{_sysconfdir}/dhcpd.conf
 
 # Install correct dhclient-script
 %{__mkdir} -p %{buildroot}/sbin
@@ -294,6 +294,7 @@ EOF
 %{__cp} -p server/dhcpd.conf dhcpd.conf.sample
 
 # Install default (empty) dhcpd.conf:
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp
 %{__cat} << EOF > %{buildroot}%{_sysconfdir}/dhcp/dhcpd.conf
 #
 # DHCP Server Configuration file.