From 80a77797fa1771d9de1a7f2e991a37812134092b Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Fri, 8 Jun 2007 12:59:58 +0000
Subject: [PATCH] - Update to 2.3 - Spec file cleanups.

---
 .cvsignore                   |  2 +-
 python-ldap-2.2.0-dirs.patch |  8 +++---
 python-ldap.spec             | 51 ++++++++++++++++++++++++------------
 sources                      |  2 +-
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d7a5427..e268568 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-python-ldap-2.2.0.tar.gz
+python-ldap-2.3.tar.gz
diff --git a/python-ldap-2.2.0-dirs.patch b/python-ldap-2.2.0-dirs.patch
index c6c274f..590aa24 100644
--- a/python-ldap-2.2.0-dirs.patch
+++ b/python-ldap-2.2.0-dirs.patch
@@ -1,11 +1,11 @@
---- 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
+--- python-ldap-2.3/setup.cfg.dirs	2006-11-15 12:26:26.000000000 -0500
++++ python-ldap-2.3/setup.cfg	2007-06-08 08:55:58.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
+-library_dirs = /usr/local/openldap-2.3/lib
+-include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl
 +include_dirs = /usr/include/sasl
  
  extra_compile_args = 
diff --git a/python-ldap.spec b/python-ldap.spec
index 4b8a877..6de6ac1 100644
--- a/python-ldap.spec
+++ b/python-ldap.spec
@@ -1,22 +1,35 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 %define openldap_version 2.1.22
 
-Name:           python-ldap
-Version:        2.2.0
-Release: 	3
-Epoch:		0
-Summary:        An object-oriented API to access LDAP directory servers.
-Group:          System Environment/Libraries
-License:        PSF - see LICENCE
-URL:            http://python-ldap.sourceforge.net/
-Source:         %{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+### Abstract ###
+
+Name: python-ldap
+Version: 2.3
+Release: 1%{?dist}
+Epoch: 0
+License: PSF - see LICENCE
+Group: System Environment/Libraries
+Summary: An object-oriented API to access LDAP directory servers.
+URL: http://python-ldap.sourceforge.net/
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Source: python-ldap-%{version}.tar.gz
+
+### Patches ###
+
+Patch0: python-ldap-2.2.0-dirs.patch
+
+### Dependencies ###
+
+Requires: openldap >= %{openldap_version}
+
+### Build Dependencies ###
 
 # 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, cyrus-sasl-devel
-Requires:       openldap >= %{openldap_version}
-
-Patch0:         python-ldap-2.2.0-dirs.patch
+BuildRequires: openldap-devel >= %{openldap_version}
+BuildRequires: openssl-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: cyrus-sasl-devel
 
 %description
 python-ldap provides an object-oriented API for working with LDAP within
@@ -25,7 +38,7 @@ OpenLDAP 2.x libraries, and contains modules for other LDAP-related tasks
 (including processing LDIF, LDAPURLs, LDAPv3 schema, etc.).
 
 %prep
-%setup -q 
+%setup -q -n python-ldap-%{version}
 %patch0 -p1 -b .dirs
 
 %build
@@ -36,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --root=$RPM_BUILD_ROOT \
   --record=INSTALLED_FILES
 sed 's|^\(.*\.pyo\)$|%ghost \1|' < INSTALLED_FILES > %{name}-%{version}.files
-find $RPM_BUILD_ROOT%{_libdir}/python?.?/site-packages/* -type d \
+find $RPM_BUILD_ROOT/%{python_sitearch}/* -type d \
   | sed "s|^$RPM_BUILD_ROOT|%dir |" >> %{name}-%{version}.files
 
 %clean
@@ -47,6 +60,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENCE CHANGES README TODO Demo
 
 %changelog
+* Fri Jun 08 2007 Matthew Barnes <mbarnes@redhat.com> - 0:2.3.0-1.fc8
+- Update to 2.3
+- Spec file cleanups.
+
 * Thu Dec  7 2006 Jeremy Katz <katzj@redhat.com> - 0:2.2.0-3
 - rebuild against python 2.5
 
diff --git a/sources b/sources
index cf62dfe..10ae944 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f17b02ef1dc6ab12d819bfef9c036627  python-ldap-2.2.0.tar.gz
+0ff25da2212237d780870354d868ffca  python-ldap-2.3.tar.gz