From eff8af32b7ee9d47459e1c9782e7df371960f111 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Jan 05 2009 22:45:37 +0000
Subject: - Move /etc/dhclient.conf to /etc/dhcp/dhclient.conf

- Move /etc/dhcpd.conf to /etc/dhcp/dhcpd.conf

---

diff --git a/dhcp-4.0.0-paths.patch b/dhcp-4.0.0-paths.patch
index 12dc933..10cfa64 100644
--- a/dhcp-4.0.0-paths.patch
+++ b/dhcp-4.0.0-paths.patch
@@ -1,7 +1,12 @@
-diff -up dhcp-4.0.0/includes/dhcpd.h.paths dhcp-4.0.0/includes/dhcpd.h
---- dhcp-4.0.0/includes/dhcpd.h.paths	2008-01-01 15:09:21.000000000 -1000
-+++ dhcp-4.0.0/includes/dhcpd.h	2008-01-01 15:10:55.000000000 -1000
-@@ -1306,11 +1306,11 @@ typedef unsigned char option_mask [16];
+diff -up dhcp-4.0.0/includes/dhcpd.h.path dhcp-4.0.0/includes/dhcpd.h
+--- dhcp-4.0.0/includes/dhcpd.h.path	2008-08-23 18:25:54.000000000 -1000
++++ dhcp-4.0.0/includes/dhcpd.h	2008-08-23 18:26:21.000000000 -1000
+@@ -1302,15 +1302,15 @@ typedef unsigned char option_mask [16];
+ #else /* !DEBUG */
+ 
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF	"/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
  #endif /* DEBUG */
  
  #ifndef _PATH_DHCPD_DB
@@ -15,6 +20,15 @@ diff -up dhcp-4.0.0/includes/dhcpd.h.paths dhcp-4.0.0/includes/dhcpd.h
  #endif
  
  #ifndef _PATH_DHCPD_PID
+@@ -1324,7 +1324,7 @@ typedef unsigned char option_mask [16];
+ #endif /* DEBUG */
+ 
+ #ifndef _PATH_DHCLIENT_CONF
+-#define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
++#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_SCRIPT
 @@ -1340,11 +1340,11 @@ typedef unsigned char option_mask [16];
  #endif
  
diff --git a/dhcp.spec b/dhcp.spec
index 43d04cf..effcd8c 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -17,7 +17,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.0.0
-Release:  33%{?dist}
+Release:  34%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -329,6 +329,9 @@ EOF
 %{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema
 %{__install} -p -m 0644 -D %{SOURCE9} %{buildroot}%{_sysconfdir}/openldap/schema
 
+# Install empty directory for dhclient.d scripts
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp/dhclient.d
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -384,6 +387,7 @@ fi
 %files -n dhclient
 %defattr(-,root,root,-)
 %doc dhclient.conf.sample
+%dir %{_sysconfdir}/dhcp/dhclient.d
 %dir %{_localstatedir}/lib/dhclient
 /sbin/dhclient
 /sbin/dhclient-script
@@ -406,6 +410,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Dec 18 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-34
+- Move /etc/dhclient.conf to /etc/dhcp/dhclient.conf
+- Move /etc/dhcpd.conf to /etc/dhcp/dhcpd.conf
+
 * Thu Dec 18 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-33
 - Remove unnecessary success/failure lines in init scripts (#476846)