From 15c52a1d906a5ae26a29f33be13aaf684c9b7ad3 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Mon, 14 Nov 2005 16:46:58 +0000
Subject: [PATCH] - rebuild with new OpenLDAP, overriding the version checks to
 assume that     2.3 is acceptable - remove a lingering patch for 1.x which we
 no longer use

---
 cyrus-sasl.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index aa2ee17..1c51443 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -1,4 +1,3 @@
-%define cs1_version 1.5.28
 %define _plugindir %{_libdir}/sasl
 %define _plugindir2 %{_libdir}/sasl2
 %define db_version 4.3.27
@@ -6,7 +5,7 @@
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 2.1.21
-Release: 7
+Release: 8
 License: Freely Distributable
 Group: System Environment/Libraries
 Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@@ -24,13 +23,13 @@ Patch7: cyrus-sasl-2.1.20-gssapi-dynamic.patch
 Patch9: cyrus-sasl-2.1.17-saslauthd1.patch
 Patch10: cyrus-sasl-2.1.21-db_bundle.patch
 Patch11: cyrus-sasl-2.1.18-no_rpath.patch
-Patch12: cyrus-sasl-1.5.28-env.patch
 Patch13: cyrus-sasl-2.1.20-notgnu.patch
 Patch14: cyrus-sasl-2.1.20-conflict.patch
 Patch15: cyrus-sasl-2.1.20-saslauthd.conf-path.patch
 Patch17: cyrus-sasl-2.1.21-builddir.patch
 Patch18: cyrus-sasl-2.1.21-linksrcs.patch
 Patch19: cyrus-sasl-2.1.21-openssl-098.patch
+Patch20: cyrus-sasl-2.1.21-openldap-2.3.patch
 Patch50: db-4.3.27-initmem.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildPrereq: autoconf, automake, libtool, groff
@@ -136,6 +135,7 @@ popd
 %patch17 -p1 -b .builddir
 %patch18 -p1 -b .linksrcs
 %patch19 -p1 -b .openssl-098
+%patch20 -p1 -b .openldap-2.3
 # FIXME - this is just weird
 rm config/ltconfig config/libtool.m4
 rm -fr autom4te.cache
@@ -405,6 +405,11 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Mon Nov 14 2005 Nalin Dahyabhai <nalin@redhat.com> 2.1.21-8
+- rebuild with new OpenLDAP, overriding the version checks to assume that 2.3
+  is acceptable
+- remove a lingering patch for 1.x which we no longer use
+
 * Sat Nov 12 2005 Tom Lane <tgl@redhat.com> 2.1.21-7
 - Rebuild due to mysql update.