From 10ed0bc9f05e127b4d4f7108bceafcc5a72e5b67 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Tue, 16 May 2006 19:51:42 +0000
Subject: [PATCH] - Update to 2.2.0 - Update python-ldap-2.0.6-rpath.patch and
 rename it to     python-ldap-2.2.0-dirs.patch.

---
 .cvsignore                   |  2 +-
 python-ldap-2.2.0-dirs.patch | 12 ++++++++++++
 python-ldap.spec             | 19 ++++++++++++-------
 sources                      |  2 +-
 4 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 python-ldap-2.2.0-dirs.patch

diff --git a/.cvsignore b/.cvsignore
index 2020684..d7a5427 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-python-ldap-2.0.6.tar.gz
+python-ldap-2.2.0.tar.gz
diff --git a/python-ldap-2.2.0-dirs.patch b/python-ldap-2.2.0-dirs.patch
new file mode 100644
index 0000000..c6c274f
--- /dev/null
+++ b/python-ldap-2.2.0-dirs.patch
@@ -0,0 +1,12 @@
+--- python-ldap-2.2.0/setup.cfg.dirs	2005-07-28 08:56:49.000000000 -0400
++++ python-ldap-2.2.0/setup.cfg	2006-05-16 15:39:09.000000000 -0400
+@@ -7,8 +7,7 @@
+ # for wrapping OpenLDAP 2 libs
+ [_ldap]
+ 
+-library_dirs = /usr/local/openldap-REL_ENG_2_1/lib /usr/local/cyrus-sasl/lib
+-include_dirs = /usr/local/openldap-REL_ENG_2_1/include /usr/local/cyrus-sasl/include
++include_dirs = /usr/include/sasl
+ 
+ extra_compile_args = 
+ extra_objects = 
diff --git a/python-ldap.spec b/python-ldap.spec
index 427294d..40bd230 100644
--- a/python-ldap.spec
+++ b/python-ldap.spec
@@ -2,24 +2,24 @@
 %define openldap_version 2.1.22
 
 Name:           python-ldap
-Version:        2.0.6
-Release: 5.2.1
-Epoch:          0
+Version:        2.2.0
+Release: 	1
 Summary:        An object-oriented API to access LDAP directory servers.
 
 Group:          System Environment/Libraries
 License:        PSF - see LICENCE
 URL:            http://python-ldap.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/python-ldap/python-ldap-2.0.6.tar.gz
-Patch0:         python-ldap-2.0.6-rpath.patch
+Source:         %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # the openldap from RHL <= 9 and RHEL <= 3 is too old for python-ldap
 BuildRequires:  openldap-devel >= %{openldap_version}, openssl-devel
-BuildRequires:  python-devel >= 2.2
+BuildRequires:  python-devel >= 2.2, cyrus-sasl-devel
 Requires:       openldap >= %{openldap_version}
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
+Patch0:         python-ldap-2.2.0-dirs.patch
+
 %description
 python-ldap provides an object-oriented API for working with LDAP within
 Python programs.  It allows access to LDAP directory servers by wrapping the 
@@ -28,7 +28,7 @@ OpenLDAP 2.x libraries, and contains modules for other LDAP-related tasks
 
 %prep
 %setup -q 
-%patch -p1
+%patch0 -p1 -b .dirs
 
 %build
 %{__python} setup.py build
@@ -49,6 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENCE CHANGES README TODO Demo
 
 %changelog
+* Tue May 15 2006 Matthew Barnes <mbarnes@redhat.com> - 2.2.0-1
+- Update to 2.2.0
+- Update python-ldap-2.0.6-rpath.patch and rename it to
+  python-ldap-2.2.0-dirs.patch.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0:2.0.6-5.2.1
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index 0d37e8a..cf62dfe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59fd9345a77451b7749a28a458406695  python-ldap-2.0.6.tar.gz
+f17b02ef1dc6ab12d819bfef9c036627  python-ldap-2.2.0.tar.gz