From f4657ad6a12d01ab0bbf0137fde780d857a0585a Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspacek@redhat.com>
Date: Sep 25 2014 08:28:46 +0000
Subject: Check in python-ldap version 2.4.16


Fixes: #995545, #1007820, #1122486

---

diff --git a/.gitignore b/.gitignore
index 04384c9..91ea0bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 python-ldap-2.3.10.tar.gz
 /python-ldap-2.3.12.tar.gz
 /python-ldap-2.4.6.tar.gz
+/python-ldap-2.4.16.tar.gz
diff --git a/python-ldap-2.4.16-dirs.patch b/python-ldap-2.4.16-dirs.patch
new file mode 100644
index 0000000..18d3a2a
--- /dev/null
+++ b/python-ldap-2.4.16-dirs.patch
@@ -0,0 +1,14 @@
+diff -r -u3 python-ldap-2.4.16/setup.cfg python-ldap-2.4.16.fedora/setup.cfg
+--- python-ldap-2.4.16/setup.cfg	2014-09-10 14:17:37.000000000 +0200
++++ python-ldap-2.4.16.fedora/setup.cfg	2014-09-25 10:20:47.555165683 +0200
+@@ -1,8 +1,7 @@
+ [_ldap]
+-library_dirs = /opt/openldap/lib64 /usr/lib
+-include_dirs = /opt/openldap/include /usr/include/sasl /usr/include
++include_dirs = /usr/include/sasl /usr/include
+ defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
+-extra_compile_args = 
++extra_compile_args = -g
+ extra_objects = 
+ libs = ldap_r
+ 
diff --git a/python-ldap-2.4.6-dirs.patch b/python-ldap-2.4.6-dirs.patch
deleted file mode 100644
index 35c46cb..0000000
--- a/python-ldap-2.4.6-dirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur python-ldap-2.4.6.orig/setup.cfg python-ldap-2.4.6/setup.cfg
---- python-ldap-2.4.6.orig/setup.cfg	2011-11-27 16:28:04.000000000 +0100
-+++ python-ldap-2.4.6/setup.cfg	2012-01-02 16:20:13.840989359 +0100
-@@ -1,6 +1,5 @@
- [_ldap]
--library_dirs = /opt/openldap-RE24/lib
--include_dirs = /opt/openldap-RE24/include /usr/include/sasl
-+include_dirs = /usr/include/sasl
- defines = HAVE_SASL HAVE_TLS
- extra_compile_args = -g
- extra_objects = 
diff --git a/python-ldap.spec b/python-ldap.spec
index 425efe9..78d96e1 100644
--- a/python-ldap.spec
+++ b/python-ldap.spec
@@ -1,8 +1,8 @@
 ### Abstract ###
 
 Name: python-ldap
-Version: 2.4.6
-Release: 7%{?dist}
+Version: 2.4.16
+Release: 1%{?dist}
 Epoch: 0
 License: Python
 Group: System Environment/Libraries
@@ -12,14 +12,14 @@ Source0: http://pypi.python.org/packages/source/p/python-ldap/python-ldap-%{vers
 
 ### Patches ###
 # Fedora specific patch
-Patch0: python-ldap-2.4.6-dirs.patch
+Patch0: python-ldap-2.4.16-dirs.patch
 
 ### Dependencies ###
-
 Requires: openldap 
+# LDAP controls, extop, syncrepl require pyasn1
+Requires: python-pyasn1
 
 ### Build Dependencies ###
-
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
 BuildRequires: python2-devel 
@@ -66,6 +66,10 @@ sed -i 's|#! python|#!/usr/bin/python|g' Demo/simplebrowse.py
 %{python_sitearch}/python_ldap-%{version}-*.egg-info
 
 %changelog
+* Thu Sep 25 2014 Petr Spacek <pspacek@redhat.com> - 0:2.4.16-1
+- New upstream release fixes bug 1007820
+- Dependency on pyasn1 was added to fix bug 995545
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.6-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index ca072df..40d1a2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0407757f2b6923dbe1f700c683e9e474  python-ldap-2.4.6.tar.gz
+75549bad7eaaf4949f6adf80334f0acc  python-ldap-2.4.16.tar.gz