[dhcp/f16] fix paths.patch (#862600)

[Jiří Popelka]

commit c67b6205f962ca717cdc819ee38a6f9f4f988996
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Oct 3 13:48:54 2012 +0200

    fix paths.patch (#862600)

 dhcp-4.2.4-paths.patch |   15 +++++----------
 dhcp.spec              |    6 +++++-
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/dhcp-4.2.4-paths.patch b/dhcp-4.2.4-paths.patch
index a737571..ca9930c 100644
--- a/dhcp-4.2.4-paths.patch
+++ b/dhcp-4.2.4-paths.patch
@@ -1,7 +1,7 @@
-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];
+diff -up dhcp-4.2.4-P2/includes/dhcpd.h.paths dhcp-4.2.4-P2/includes/dhcpd.h
+--- dhcp-4.2.4-P2/includes/dhcpd.h.paths	2012-10-03 13:37:30.809867722 +0200
++++ dhcp-4.2.4-P2/includes/dhcpd.h	2012-10-03 13:38:05.595345981 +0200
+@@ -1426,7 +1426,7 @@ typedef unsigned char option_mask [16];
  #else /* !DEBUG */
  
  #ifndef _PATH_DHCPD_CONF
@@ -10,7 +10,7 @@ diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h
  #endif /* DEBUG */
  
  #ifndef _PATH_DHCPD_DB
-@@ -1442,11 +1442,11 @@ typedef unsigned char option_mask [16];
+@@ -1448,7 +1448,7 @@ typedef unsigned char option_mask [16];
  #endif /* DEBUG */
  
  #ifndef _PATH_DHCLIENT_CONF
@@ -19,8 +19,3 @@ diff -up dhcp-4.2.4b1/includes/dhcpd.h.paths dhcp-4.2.4b1/includes/dhcpd.h
  #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 7aece12..e17de57 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -19,7 +19,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.4
-Release:  2.%{patchver}%{?dist}
+Release:  3.%{patchver}%{?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.
@@ -198,6 +198,7 @@ rm bind/bind.tar.gz
 %patch0 -p1 -b .errwarn
 
 # Add more dhclient options (-I, -B, -H, -F, -timeout, -V, and -R)
+# (Submitted to dhcp-suggest at isc.org - [ISC-Bugs #31164])
 %patch1 -p1 -b .options
 
 # Handle releasing interfaces requested by /sbin/ifup
@@ -632,6 +633,9 @@ fi
 %{_initddir}/dhcrelay
 
 %changelog
+* Wed Oct 03 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-3.P2
+- fix paths.patch (#862600)
+
 * Wed Sep 26 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-2.P2
 - dhclient-usage.patch+part of manpages.patch merged with dhclient-options.patch