PR#1: Update to 2.5.1, Include Python 3 packages in EPEL - rpms/python-ldap3

		`@@ -1,48 +1,39 @@`
		`- diff --git a/ldap3/abstract/entry.py b/ldap3/abstract/entry.py`
		`- index ccbe932..199f8ed 100644`
		`- --- a/ldap3/abstract/entry.py`
		`- +++ b/ldap3/abstract/entry.py`
		`- @@ -28,7 +28,7 @@ import json`
		`- try:`
		`- from collections import OrderedDict`
		`- except ImportError:`
		`- - from ..utils.ordDict import OrderedDict # for Python 2.6`
		`- + from ordereddict import OrderedDict # for Python 2.6`
		`-`
		`- from os import linesep`
		`-`
		`- iff --git a/setup.py b/setup.py`
		`- index 313db60..3ad8915 100644`
		`- --- a/setup.py`
		`- +++ b/setup.py`
		`+ diff -ru ldap3-2.5.1-orig/ldap3/abstract/entry.py ldap3-2.5.1/ldap3/abstract/entry.py`
		`+ --- ldap3-2.5.1-orig/ldap3/abstract/entry.py 2018-04-21 02:46:24.000000000 -0400`
		`+ +++ ldap3-2.5.1/ldap3/abstract/entry.py 2018-11-12 21:08:04.323279801 -0500`
		`+ @@ -28,7 +28,7 @@`
		`+ try:`
		`+ from collections import OrderedDict`
		`+ except ImportError:`
		`+ - from ..utils.ordDict import OrderedDict # for Python 2.6`
		`+ + from ordereddict import OrderedDict # for Python 2.6`
		`+`
		`+ from os import linesep`
		`+`
		`+ diff -ru ldap3-2.5.1-orig/setup.py ldap3-2.5.1/setup.py`
		`+ --- ldap3-2.5.1-orig/setup.py 2018-07-21 00:32:31.000000000 -0400`
		`+ +++ ldap3-2.5.1/setup.py 2018-11-12 21:03:58.439206727 -0500`
		`@@ -23,6 +23,7 @@`
		`- # along with ldap3 in the COPYING and COPYING.LESSER files.`
		`- # If not, see <http://www.gnu.org/licenses/>.`
		`-`
		`- +import sys`
		`- import os`
		`- from setuptools import setup`
		`- from json import load`
		`- @@ -53,9 +54,13 @@ packages=['ldap3',`
		`- 'ldap3.extend.novell',`
		`- 'ldap3.extend.microsoft',`
		`- 'ldap3.extend.standard']`
		`- +install_requires=[i.strip() for i in open('requirements.txt').readlines()],`
		`- +if sys.version_info < (2, 7):`
		`- + install_requires.append('ordereddict')`
		`-`
		`- setup_kwargs = {'packages': packages,`
		`- - 'package_dir': {'': package_folder}}`
		`- + 'package_dir': {'': package_folder},`
		`- + 'install_requires': install_requires}`
		`-`
		`- try:`
		`- from Cython.Build import cythonize`
		`- @@ -148,7 +153,6 @@ if 'LDAP3_CYTHON_COMPILE' in os.environ and HAS_CYTHON is True:`
		`-`
		`- setup(name=package_name,`
		`- version=version,`
		`- - install_requires=[i.strip() for i in open('requirements.txt').readlines()],`
		`- license=license,`
		`- author=author,`
		`- author_email=email,`
		`+ # If not, see <http://www.gnu.org/licenses/>.`
		`+`
		`+ import os`
		`+ +import sys`
		`+ import glob`
		`+ import shutil`
		`+ from json import load`
		`+ @@ -80,11 +81,13 @@`
		`+`
		`+`
		`+ setup_kwargs['cmdclass'] = {'clean': Clean}`
		`+ -`
		`+ +install_requires = [i.strip() for i in open('requirements.txt').readlines()]`
		`+ +if sys.version_info < (2, 7):`
		`+ + install_requires.append('ordereddict')`
		`+`
		`+ setup(name=package_name,`
		`+ version=version,`
		`+ - install_requires=[i.strip() for i in open('requirements.txt').readlines()],`
		`+ + install_requires=install_requires,`
		`+ license=license,`
		`+ author=author,`
		`+ author_email=email,`

python-ldap3.spec

file modified

+43 -43

		`@@ -1,20 +1,13 @@`
		`- %if 0%{?rhel} && 0%{?rhel} <= 7`
		`- %bcond_with python3`
		`- %else`
		`- %bcond_without python3`
		`- %endif`
		`+ %global pypi_name ldap3`

		`- %global modname ldap3`
		`-`
		`- Name: python-%{modname}`
		`- Version: 2.4`
		`+ Name: python-%{pypi_name}`
		`+ Version: 2.5.1`
		`Release: 1%{?dist}`
		`Summary: Strictly RFC 4511 conforming LDAP V3 pure Python client`

		`License: LGPLv2+`
		`URL: https://github.com/cannatag/ldap3`
		`- Source0: %{url}/archive/v%{version}/%{modname}-%{version}.tar.gz`
		`-`
		`+ Source0: %{pypi_source}`
		`Patch0002: 0002-unbundle-ordereddict.patch`

		`BuildArch: noarch`
		`@@ -24,69 +17,76 @@`

		`%description %{_description}`

		`- %package -n python2-%{modname}`
		`+ %package -n python2-%{pypi_name}`
		`Summary: %{summary}`
		`- %{?python_provide:%python_provide python2-%{modname}}`
		`+ %{?python_provide:%python_provide python2-%{pypi_name}}`
		`BuildRequires: python2-devel`
		`- %if 0%{?rhel} && 0%{?rhel} <= 7`
		`- BuildRequires: python-setuptools`
		`- Requires: python-pyasn1`
		`- %else`
		`BuildRequires: python2-setuptools`
		`Requires: python2-pyasn1`
		`- %endif`
		`- Requires: python-backports-ssl_match_hostname`
		`+ Requires: python2-backports-ssl_match_hostname`

		`- %description -n python2-%{modname} %{_description}`
		`+ %description -n python2-%{pypi_name} %{_description}`

		`Python 2 version.`

		`- %if %{with python3}`
		`- %package -n python3-%{modname}`
		`+ %package -n python%{python3_pkgversion}-%{pypi_name}`
		`Summary: %{summary}`
		`- %{?python_provide:%python_provide python3-%{modname}}`
		`- BuildRequires: python3-devel`
		`- BuildRequires: python3-setuptools`
		`- Requires: python3-pyasn1`
		`- Requires: python-backports-ssl_match_hostname`
		`+ %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}`
		`+ BuildRequires: python%{python3_pkgversion}-devel`
		`+ BuildRequires: python%{python3_pkgversion}-setuptools`
		`+ Requires: python%{python3_pkgversion}-pyasn1`
		`+ Requires: python2-backports-ssl_match_hostname`

		`- %description -n python3-%{modname} %{_description}`
		`+ %description -n python%{python3_pkgversion}-%{pypi_name} %{_description}`

		`Python 3 version.`
		`- %endif`

		`%prep`
		`- %autosetup -n %{modname}-%{version} -p1`
		`+ %autosetup -n %{pypi_name}-%{version} -p1`
		`+`
		`# remove bundled ordereddict`
		`- rm -vf %{modname}/utils/ordDict.py`
		`+ rm -vf %{pypi_name}/utils/ordDict.py`

		`%build`
		`%py2_build`
		`- %if %{with python3}`
		`%py3_build`
		`- %endif`

		`%install`
		`%py2_install`
		`- %if %{with python3}`
		`%py3_install`
		`- %endif`

		`- %files -n python2-%{modname}`
		`+ %files -n python2-%{pypi_name}`
		`%license COPYING.LESSER.txt`
		`%doc README.rst`
		`- %{python2_sitelib}/%{modname}-*.egg-info/`
		`- %{python2_sitelib}/%{modname}/`
		`+ %{python2_sitelib}/%{pypi_name}-*.egg-info/`
		`+ %{python2_sitelib}/%{pypi_name}/`

		`- %if %{with python3}`
		`- %files -n python3-%{modname}`
		`+ %files -n python%{python3_pkgversion}-%{pypi_name}`
		`%license COPYING.LESSER.txt`
		`%doc README.rst`
		`- %{python3_sitelib}/%{modname}-*.egg-info/`
		`- %{python3_sitelib}/%{modname}/`
		`- %endif`
		`+ %{python3_sitelib}/%{pypi_name}-*.egg-info/`
		`+ %{python3_sitelib}/%{pypi_name}/`

		`%changelog`
		`+ * Mon Nov 12 2018 Avram Lubkin <aviso@rockhopper.net> - 2.5.1-1`
		`+ - Update to 2.5.1`
		`+ - Build Python 3 packages for EPEL`
		`+`
		`+ * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-3`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`
		`+`
		`+ * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.5-2`
		`+ - Rebuilt for Python 3.7`
		`+`
		`+ * Mon Apr 16 2018 Michal Cyprian <mcyprian@redhat.com> - 2.5-1`
		`+ - Update to 2.5`
		`+`
		`+ * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2`
		`+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild`
		`+`
		`+ * Tue Jan 23 2018 Igor Gnatenko <ignatenko@redhat.com> - 2.4.1-1`
		`+ - Update to 2.4.1`
		`+`
		`* Thu Nov 16 2017 Michal Cyprian <mcyprian@redhat.com> - 2.4-1`
		`- Update to 2.4`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (ldap3-2.4.tar.gz) = d580a9a5e5dd34e1c3218ed7912ebb4da9fc1673c337a37b50ae0577cc2f2fb3073a77ee031885d40a68aef86955c137474e77e94b92e03a2d9511b60780dde5`
		`+ SHA512 (ldap3-2.5.1.tar.gz) = 8cf3e656f3b58ead391f45c44ec2175ecb7abf29047e4eb03d9f95983cb01900159a4e27bef596df5ffdf7fdf3827615663872c35bd57dede8c9b789aad191e7`