rpms/dhcp/devel dhcp.spec,1.234,1.235

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18178

Modified Files:
	dhcp.spec 
Log Message:
* Sat Jan 10 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-2
- 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



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- dhcp.spec	10 Jan 2009 16:38:36 -0000	1.234
+++ dhcp.spec	10 Jan 2009 16:46:16 -0000	1.235
@@ -257,7 +257,8 @@
 %{__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