From 8d8124c73513d7a5e9e9e5d159779d703fcaf63b Mon Sep 17 00:00:00 2001
From: bojan <bojan@fedoraproject.org>
Date: Jul 07 2008 22:21:13 +0000
Subject: Add patch to use --avoid-ldap with apu-1-config.


---

diff --git a/libapreq2-2.09-avoid_ldap.patch b/libapreq2-2.09-avoid_ldap.patch
new file mode 100644
index 0000000..76a405d
--- /dev/null
+++ b/libapreq2-2.09-avoid_ldap.patch
@@ -0,0 +1,15 @@
+--- acinclude.m4.orig	2008-07-08 08:17:02.000000000 +1000
++++ acinclude.m4	2008-07-08 08:17:40.000000000 +1000
+@@ -168,10 +168,10 @@
+         dnl provide identical dependency names: libexpat.so.0  
+         dnl (possible multiple inclusion of the same file)
+         if test "x$OS" = "xsolaris"; then
+-            APU_LIBS=`$APU_CONFIG --libs | $PERL -pe 's,-lexpat,,'`
++            APU_LIBS=`$APU_CONFIG --avoid-ldap --libs | $PERL -pe 's,-lexpat,,'`
+             APR_ADDTO([APR_LIBS], "$APU_LIBS")
+         else
+-            APR_ADDTO([APR_LIBS], "`$APU_CONFIG --libs`")
++            APR_ADDTO([APR_LIBS], "`$APU_CONFIG --avoid-ldap --libs`")
+         fi
+ 
+         APR_ADDTO([APR_LDFLAGS], "`$APU_CONFIG --link-ld --ldflags`")
diff --git a/libapreq2.spec b/libapreq2.spec
index a2f0ffe..918e159 100644
--- a/libapreq2.spec
+++ b/libapreq2.spec
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.17.rc2%{?dist}
+Release:        0.18.rc2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -16,6 +16,7 @@ Patch1:         %{name}-2.07-rc3-ldflags.patch
 Patch2:         %{name}-2.09-version_check.patch
 Patch3:         %{name}-2.09-pkgconfig.patch
 Patch4:         %{name}-2.09-Makefile_PL.patch
+Patch5:         %{name}-2.09-avoid_ldap.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel >= 2.0.48
@@ -92,6 +93,7 @@ apuver=$(apu-1-config --version || apu-config --version)
 %patch2
 %patch3
 %patch4
+%patch5
 
 # Fix multilib
 sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
@@ -174,6 +176,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul  8 2008 Bojan Smojver <bojan@rexursive.com> - 2.09-0.18.rc2
+- add patch to use --avoid-ldap with apu-1-config
+
 * Thu Jun  5 2008 Bojan Smojver <bojan@rexursive.com> - 2.09-0.17.rc2
 - bump to re-tag