From ecbba72ec85a55256bf1f82e6ef272638de9a714 Mon Sep 17 00:00:00 2001
From: Jakub Jedelsky <jakub.jedelsky@gmail.com>
Date: Mon, 3 Sep 2018 14:36:52 +0200
Subject: [PATCH] Update to version 0.7.4

And add support for python3 for RHEL releases >= 7.

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

diff --git a/.gitignore b/.gitignore
index 4e14438..fe2765a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /0.5.5.tar.gz
 /0.6.14.tar.gz
 /0.7.3.tar.gz
+/0.7.4.tar.gz
diff --git a/sources b/sources
index 2f6adeb..4361d12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (0.7.3.tar.gz) = 61a623f5d4f7ac6ae5393c34152f328e370d82aaaef21126afab973979472bf39774fb5792b6355fb23b5fc3ae52414c210caef97d197ac15c7d12dea8e106fd
+SHA512 (0.7.4.tar.gz) = c40614b724d580bca09b26abdb60c20d26878baee7f462ad0c53051e43071bd9eb953a07ec5c2501c7bc56914b17dc3a6f06b96d826cb5fe607fd4b5cde93081
diff --git a/vertica-python.spec b/vertica-python.spec
index 61a1db6..6beda7f 100644
--- a/vertica-python.spec
+++ b/vertica-python.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{rhel} >= 7
 %global with_python3 1
 %endif
 
@@ -8,8 +8,8 @@
 %{!?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.7.3
-Release:        3%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        A native Python adapter for the Vertica database
 
 Group:          Development/Languages
@@ -52,18 +52,21 @@ Obsoletes: vertica-python < %{version}-%{release}
 
 %if 0%{?with_python3}
 
-%package -n python3-vertica
+%package -n python%{python3_pkgversion}-vertica
 Summary: %summary
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-Requires:       python3-dateutil >= 1.5
-Requires:       python3-setuptools
-Requires:       python3-pytz
-Requires:       python3-psycopg2
-Requires:       python3-future
-%{?python_provide:%python_provide python3-vertica}
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+Requires:       python%{python3_pkgversion}-dateutil >= 1.5
+Requires:       python%{python3_pkgversion}-setuptools
+Requires:       python%{python3_pkgversion}-pytz
+Requires:       python%{python3_pkgversion}-psycopg2
+Requires:       python%{python3_pkgversion}-future
+%{?python_provide:%python_provide python%{python3_pkgversion}-vertica}
+# Remove before F30
+Provides: vertica-python%{python3_pkgversion} = %{version}-%{release}
+Obsoletes: vertica-python%{python3_pkgversion} < %{version}-%{release}
 
-%description -n python3-vertica %_description
+%description -n python%{python3_pkgversion}-vertica %_description
 
 %endif
 
@@ -98,7 +101,7 @@ Requires:       python3-future
 %{python2_sitelib}/vertica_python/*
 
 %if 0%{?with_python3}
-%files -n python3-vertica
+%files -n python%{python3_pkgversion}-vertica
 %license LICENSE
 %doc README.md
 %{python3_sitelib}/*.egg-info
@@ -108,6 +111,10 @@ Requires:       python3-future
 
 
 %changelog
+* Mon Sep 03 2018 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.7.4-1
+- Upgrade to version 0.7.4
+- Build python 3 subpackage even on RHEL >= 7
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild