From 0191ba87b7f96d95be5f2a7530e976c9dd18e57c Mon Sep 17 00:00:00 2001
From: Jakub Jedelsky <jakub.jedelsky@gmail.com>
Date: Fri, 29 Nov 2019 23:33:10 +0100
Subject: [PATCH] Update to version 0.10.0 support python3 by default

Signed-off-by: Jakub Jedelsky <jakub.jedelsky@gmail.com>
---
 .gitignore          |  1 +
 sources             |  2 +-
 vertica-python.spec | 38 +++++---------------------------------
 3 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index e7d2b9d..418ad90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /0.9.1.tar.gz
 /0.9.2.tar.gz
 /0.9.3.tar.gz
+/0.10.0.tar.gz
diff --git a/sources b/sources
index 400af00..8f17b66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (0.9.3.tar.gz) = 79cac8e8d62375d020fa0dc38a8710b541dc4e9719982810951e801c3571dadc9acb764afd3ce357525f32f43a43f7625b4bb17cef80f89a0a98ba5f7c913516
+SHA512 (0.10.0.tar.gz) = b2941f8395e98ddc25d2cc718f1d36ef814a9890e4114ec199f59cee46bcc962362ba93e65ec72bc9da049bb3e6c563d78c859e783d68762164c9701de38623b
diff --git a/vertica-python.spec b/vertica-python.spec
index 6c4d155..a9cfb9a 100644
--- a/vertica-python.spec
+++ b/vertica-python.spec
@@ -1,14 +1,5 @@
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%global with_python3 1
-%endif
-
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}}
-%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root $RPM_BUILD_ROOT}}
-
 Name:           vertica-python
-Version:        0.9.3
+Version:        0.10.0
 Release:        1%{?dist}
 Summary:        A native Python adapter for the Vertica database
 
@@ -16,15 +7,12 @@ Group:          Development/Languages
 License:        MIT
 URL:            https://github.com/uber/vertica-python
 Source0:        https://github.com/uber/vertica-python/archive/%{version}.tar.gz
-# EPEL 6 patch
-Patch0:         vertica-python-0.7.3-dateutil15.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 
 
-
 %global _description\
 vertica-python is a native Python adapter for the Vertica\
 (http://www.vertica.com) database.\
@@ -34,23 +22,15 @@ vertica-python is a native Python adapter for the Vertica\
 
 %package -n python2-vertica
 Summary: %summary
-%if 0%{?rhel} && 0%{?rhel} <= 6
-Requires:       python-dateutil15
-Requires:       python-setuptools
-%else
 Requires:       python2-dateutil >= 1.5
-%endif
 Requires:       python2-pytz
 Requires:       python2-future
 %{?python_provide:%python_provide python2-vertica}
-# Remove before F30
 Provides: vertica-python = %{version}-%{release}
 Obsoletes: vertica-python < %{version}-%{release}
 
 %description -n python2-vertica %_description
 
-%if 0%{?with_python3}
-
 %package -n python%{python3_pkgversion}-vertica
 Summary: %summary
 BuildRequires:  python%{python3_pkgversion}-devel
@@ -66,29 +46,19 @@ Obsoletes: vertica-python%{python3_pkgversion} < %{version}-%{release}
 
 %description -n python%{python3_pkgversion}-vertica %_description
 
-%endif
-
 
 %prep
 %setup -q -n vertica-python-%{version}
 
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%patch0 -p1
-%endif
-
 
 %build
 %py2_build
-%if 0%{?with_python3}
 %py3_build
-%endif
 
 
 %install
 %py2_install
-%if 0%{?with_python3}
 %py3_install
-%endif
 
  
 %files -n python2-vertica
@@ -98,17 +68,19 @@ Obsoletes: vertica-python%{python3_pkgversion} < %{version}-%{release}
 %dir %{python2_sitelib}/vertica_python
 %{python2_sitelib}/vertica_python/*
 
-%if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-vertica
 %license LICENSE
 %doc README.md
 %{python3_sitelib}/*.egg-info
 %dir %{python3_sitelib}/vertica_python
 %{python3_sitelib}/vertica_python/*
-%endif
 
 
 %changelog
+* Fri Nov 29 2019 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.10.0-1
+- Update to version 0.10.0
+- support python3 by default
+
 * Sun Jun 23 2019 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.9.3-1
 - Update to version 0.9.3