From 13e275739d234871976abcf341a175362690dd4c Mon Sep 17 00:00:00 2001
From: Daniel Bruno <danielbrunos@gmail.com>
Date: Sep 22 2015 14:40:22 +0000
Subject: Upgrade 1.7.0


---

diff --git a/.gitignore b/.gitignore
index ec47113..b2de802 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /elasticsearch-0.4.3.tar.gz
 /elasticsearch-1.0.0.tar.gz
+/elasticsearch-1.7.0.tar.gz
diff --git a/python-elasticsearch.spec b/python-elasticsearch.spec
index 4216de9..1472644 100644
--- a/python-elasticsearch.spec
+++ b/python-elasticsearch.spec
@@ -1,17 +1,25 @@
-%global tarball_name elasticsearch 
+%global tarball_name elasticsearch
+%bcond_without python3
 
 Name:           python-elasticsearch
-Version:        1.0.0
-Release:        2%{?dist}
-Summary:        Client for Elasticsearch 
+Version:        1.7.0
+Release:        1%{?dist}
+Summary:        Client for Elasticsearch
 
-Group:          Development/Languages
 License:        ASL 2.0
 URL:            https://github.com/elasticsearch/elasticsearch-py
 Source0:        https://pypi.python.org/packages/source/e/%{tarball_name}/%{tarball_name}-%{version}.tar.gz
 BuildArch:      noarch
-BuildRequires:  python2-devel python-setuptools
-Requires:       python-thrift python-urllib3
+
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+Requires:       python-thrift
+
+%if %{with python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+# optional thrift not supported on Python 3
+%endif
 
 %description
 Low level client for Elasticsearch. It's goal is to provide common ground
@@ -26,23 +34,84 @@ for all Elasticsearch-related code in Python. The client's features include:
 - Thread safety
 - Pluggable architecture
 
+%if %{with python3}
+%package -n python3-%{tarball_name}
+Summary:        Python 3 Client for Elasticsearch
+License:        ASL 2.0
+
+%description -n python3-%{tarball_name}
+Low level client for Elasticsearch. It's goal is to provide common ground
+for all Elasticsearch-related code in Python. The client's features include:
+
+- Translating basic Python data types to and from json
+- Configurable automatic discovery of cluster nodes
+- Persistent connections
+- Load balancing (with pluggable selection strategy) across all available nodes
+- Failed connection penalization (time based - failed connections won't be
+  retried until a timeout is reached)
+- Thread safety
+- Pluggable architecture
+%endif
+
 %prep
 %setup -qn %{tarball_name}-%{version}
 rm -fr %{tarball_name}.egg-info
 
+%if %{with python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
+
 %build
 %{__python2} setup.py build
 
+%if %{with python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif
 
 %install
-rm -rf %{buildroot}
+%if %{with python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+popd
+%endif
+
 %{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
 %files
-%{python2_sitelib}/*
-%doc README LICENSE
+%{python2_sitelib}/%{tarball_name}
+%{python2_sitelib}/%{tarball_name}-%{version}-py2.?.egg-info
+%doc README
+%license LICENSE
+
+%if %{with python3}
+%files -n python3-elasticsearch
+%{python3_sitelib}/%{tarball_name}
+%{python3_sitelib}/%{tarball_name}-%{version}-py3.?.egg-info
+%doc README
+%license LICENSE
+%endif
 
 %changelog
+* Tue Sep 22 2015 Daniel Bruno <dbruno@fedoraproject.org> - 1.7.0-1
+- Upgrade to 1.7.0
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu May 14 2015 Piotr Popieluch <piotr1212@gmail.com> - 1.4.0-2
+- Add python3 module
+- Remove trailing whitespace
+- Remove deprecated group tag
+- Move license from %%doc to %%license
+- Remove deprecated rm -rf buildroot
+- fix rpmlint Error: explicit-lib-dependency python-urllib3
+
+* Tue Apr 07 2015 Alan Pevec <apevec@fedoraproject.org> - 1.4.0-1
+- Upgrade to 1.4.0 version
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -51,4 +120,3 @@ rm -rf %{buildroot}
 
 * Tue Nov 26 2013 Daniel Bruno <dbruno@fedoraproject.org> - 0.4.3-1
 - First RPM release
-
diff --git a/sources b/sources
index e0d63e0..bf165d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac087d3f7a704b2c45079e7e25b56b9f  elasticsearch-1.0.0.tar.gz
+9e6ca52b62ae597da37208cffd121c76  elasticsearch-1.7.0.tar.gz