[dhcp/f17] Update paths.patch and source URL

[Jiří Popelka]

commit b2ce0ea4b3b55f9921a5b82c6341a75200d3d73f
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Apr 18 11:17:13 2012 +0200

    Update paths.patch and source URL
    
    We don't need to change paths to leases files because
    we define these when running configure.
    We need to change path to dhclient-script.

 dhcp-4.2.0-paths.patch |   45 ---------------------------------------------
 dhcp-4.2.4-paths.patch |   26 ++++++++++++++++++++++++++
 dhcp.spec              |    9 ++++++---
 3 files changed, 32 insertions(+), 48 deletions(-)
---
diff --git a/dhcp-4.2.4-paths.patch b/dhcp-4.2.4-paths.patch
new file mode 100644
index 0000000..a737571
--- /dev/null
+++ b/dhcp-4.2.4-paths.patch
@@ -0,0 +1,26 @@
+diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h
+--- dhcp-4.2.4b1/includes/dhcpd.h.paths	2012-04-18 11:12:34.000000000 +0200
++++ dhcp-4.2.4b1/includes/dhcpd.h	2012-04-18 11:14:38.541272405 +0200
+@@ -1420,7 +1420,7 @@ 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
+@@ -1442,11 +1442,11 @@ 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
+-#define _PATH_DHCLIENT_SCRIPT	"/sbin/dhclient-script"
++#define _PATH_DHCLIENT_SCRIPT	"/usr/sbin/dhclient-script"
+ #endif
+ 
+ #ifndef _PATH_DHCLIENT_PID
diff --git a/dhcp.spec b/dhcp.spec
index 6b196ac..19f4899 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -19,7 +19,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.4
-Release:  0.1.%{prever}%{?dist}
+Release:  0.2.%{prever}%{?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.
@@ -28,7 +28,7 @@ Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
 URL:      http://isc.org/products/DHCP/
-Source0:  ftp://ftp.isc.org/isc/dhcp/dhcp-%{VERSION}.tar.gz
+Source0:  ftp://ftp.isc.org/isc/dhcp/%{VERSION}/dhcp-%{VERSION}.tar.gz
 Source1:  dhclient-script
 Source2:  README.dhclient.d
 Source3:  11-dhclient
@@ -46,7 +46,7 @@ Patch6:   dhcp-4.2.2-dhclient-usage.patch
 Patch7:   dhcp-4.2.0-default-requested-options.patch
 Patch8:   dhcp-4.2.2-xen-checksum.patch
 Patch10:  dhcp-4.2.1-manpages.patch
-Patch11:  dhcp-4.2.0-paths.patch
+Patch11:  dhcp-4.2.4-paths.patch
 Patch12:  dhcp-4.2.2-CLOEXEC.patch
 Patch13:  dhcp-4.2.0-inherit-leases.patch
 Patch14:  dhcp-4.2.0-garbage-chars.patch
@@ -604,6 +604,9 @@ fi
 
 
 %changelog
+* Wed Apr 18 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-0.2.b1
+- update paths.patch and source URL
+
 * Mon Apr 16 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-0.1.b1
 - 4.2.4b1: noprefixavail.patch merged upstream