- up to 2.4.32

- disabled tests (require openldap server)

diff --git a/build.patch b/build.patch
deleted file mode 100644 (file)
index 7ccf08c..0000000
--- a/build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- python-ldap-2.4.16/setup.cfg.orig  2014-09-10 22:33:10.277877606 +0200
-+++ python-ldap-2.4.16/setup.cfg       2014-09-10 22:33:21.851210582 +0200
-@@ -1,6 +1,5 @@
- [_ldap]
--library_dirs = /opt/openldap-RE24/lib /usr/lib
--include_dirs = /opt/openldap-RE24/include /usr/include/sasl /usr/include
-+include_dirs = /usr/include/sasl
- defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
- extra_compile_args = 
- extra_objects = 

diff --git a/python-ldap.spec b/python-ldap.spec
index 085077c800a343b704d78d0c9772ea5747a13aee..ab320bd11e3808c12100af44606e65a74fa3f77e 100644 (file)
--- a/python-ldap.spec
+++ b/python-ldap.spec
@@ -1,20 +1,19 @@
 #
 # Conditional build:
-%bcond_without tests   # do not perform "make test"
+%bcond_with    tests   # do not perform "make test"
 
 %define                module  ldap
 Summary:       LDAP client API for Python
 Summary(pl.UTF-8):     API klienckie LDAP dla Pythona
 Name:          python-%{module}
-Version:       2.4.19
-Release:       3
+Version:       2.4.32
+Release:       1
 Epoch:         1
 License:       Python-like
 Group:         Libraries/Python
-Source0:       http://pypi.python.org/packages/source/p/python-ldap/%{name}-%{version}.tar.gz
-# Source0-md5: b941bf31d09739492aa19ef679e94ae3
+Source0:       https://pypi.python.org/packages/67/d9/fa0ea70d1792875745116ad62ac8d4bcb07550b15cded591bb57df6a6d9a/%{name}-%{version}.tar.gz
+# Source0-md5: 7c46c8a04acc227a778c7900c87cdfc7
 Patch0:                %{name}-sasl2.patch
-Patch1:                build.patch
 URL:           http://python-ldap.sourceforge.net/
 BuildRequires: rpmbuild(macros) >= 1.710
 BuildRequires: cyrus-sasl >= 2.1.0
@@ -47,7 +46,6 @@ przetwarzanie LDIF, LDAPURL, podschematy LDAPv3 itp.).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %py_build
@@ -56,7 +54,7 @@ przetwarzanie LDIF, LDAPURL, podschematy LDAPv3 itp.).
 %{__python} setup.py test
 
 LDAPNOINIT=1 \
-PYTHONPATH=$(echo build/lib.linux-*/) \
+PYTHONPATH=$(echo build-2/lib.linux-*/) \
 %{__python} -c "import ldap; print ldap.__version__; ldapo = ldap.initialize('ldap://localhost')"
 %endif