[dhcp] Fix loading of configuration when LDAP is used (#668276)

[Jiří Popelka]

commit 99f5023df5c7d548401647facbdbf2f54662856b
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Jan 11 18:43:02 2011 +0100

    Fix loading of configuration when LDAP is used (#668276)

 dhcp-4.2.0-P2-ldap-configuration.patch |   10 ++++++++++
 dhcp.spec                              |    9 ++++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/dhcp-4.2.0-P2-ldap-configuration.patch b/dhcp-4.2.0-P2-ldap-configuration.patch
new file mode 100644
index 0000000..6c9c3f5
--- /dev/null
+++ b/dhcp-4.2.0-P2-ldap-configuration.patch
@@ -0,0 +1,10 @@
+diff -up dhcp-4.2.0-P2/common/Makefile.am.ldap-configuration dhcp-4.2.0-P2/common/Makefile.am
+--- dhcp-4.2.0-P2/common/Makefile.am.ldap-configuration	2011-01-13 17:54:14.000000000 +0100
++++ dhcp-4.2.0-P2/common/Makefile.am	2011-01-13 17:54:14.000000000 +0100
+@@ -1,5 +1,5 @@
+ AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
+-AM_CFLAGS = -fpic
++AM_CFLAGS = $(LDAP_CFLAGS) -fpic
+ 
+ noinst_LIBRARIES = libdhcp.a
+ libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \
diff --git a/dhcp.spec b/dhcp.spec
index ab15fec..fee5584 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -12,7 +12,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.0
-Release:  25.%{patchver}%{?dist}
+Release:  26.%{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.
@@ -70,6 +70,7 @@ Patch32:  dhcp420-rh637017.patch
 Patch33:  dhcp420-sharedlib.patch
 Patch34:  dhcp-4.2.0-PPP.patch
 Patch35:  dhcp-4.2.0-P2-omapi.patch
+Patch36:  dhcp-4.2.0-P2-ldap-configuration.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -311,6 +312,9 @@ rm bind/bind.tar.gz
 # Fix OMAPI (#666441)
 %patch35 -p1 -b .omapi
 
+# Fix loading of configuration when LDAP is used (#668276)
+%patch36 -p1 -b .ldap-configuration
+
 # Copy in the Fedora/RHEL dhclient script
 %{__install} -p -m 0755 %{SOURCE4} client/scripts/linux
 %{__install} -p -m 0644 %{SOURCE5} .
@@ -658,6 +662,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Jan 13 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.0-26.P2
+- Fix loading of configuration when LDAP is used (#668276)
+
 * Mon Jan 03 2011 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.0-25.P2
 - Fix OMAPI (#666441)