From 852eb125da29e11492f0ae55b4e8852e1fe96ab0 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Jan 10 2009 16:46:16 +0000
Subject: - 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

---

diff --git a/dhcp.spec b/dhcp.spec
index c2fd1c7..c5ff017 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -257,7 +257,8 @@ CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE -DLDAP_CONFIGURATION -DUSE_SSL" \
 %{__make} install DESTDIR=%{buildroot}
 
 # Remove files we don't want
-%{__rm} %{buildroot}%{_sysconfdir}/dhcp/dhclient.conf
+%{__rm} -f %{buildroot}%{_sysconfdir}/dhclient.conf
+%{__rm} -f %{buildroot}%{_sysconfdir}/dhcp/dhclient.conf
 
 # Install correct dhclient-script
 %{__mkdir} -p %{buildroot}/sbin