Merge branch 'f21' into f20

Conflicts:
	.gitignore
	sources
	vertica-python.spec

.gitignore

@@ -0,0 +1,7 @@
+/0.2.0.tar.gz
+/0.2.1.tar.gz
+/0.2.3.tar.gz
+/v0.3.0.tar.gz
+/0.3.4.tar.gz
+/v0.3.5.tar.gz
+/0.3.6.tar.gz

dead.package

@@ -1 +0,0 @@
-Orphaned for 6+ weeks

sources

@@ -0,0 +1 @@
+fcd87e6e2619e73d2fa873ab86f1650b  0.3.6.tar.gz

vertica-python-0.2.0-dateutil15.patch

@@ -0,0 +1,16 @@
+diff --git a/vertica_python/vertica/column.py b/vertica_python/vertica/column.py
+index 75d87a2..9eeef08 100644
+--- a/vertica_python/vertica/column.py
++++ b/vertica_python/vertica/column.py
+@@ -5,6 +5,11 @@ from collections import namedtuple
+ from decimal import Decimal
+ from datetime import date
+ from datetime import datetime
++from pkg_resources import require,VersionConflict
++try:
++	require("python_dateutil>=1.5")
++except VersionConflict:
++	pass
+ from dateutil import parser
+ 
+ import pytz

vertica-python.spec

@@ -0,0 +1,92 @@
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+
+Name:           vertica-python
+Version:        0.3.6
+Release:        1%{?dist}
+Summary:        A native Python adapter for the Vertica database
+
+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.2.0-dateutil15.patch
+
+BuildArch:      noarch
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+
+%if 0%{?rhel} && 0%{?rhel} <= 6
+Requires:       python-dateutil15
+Requires:       python-setuptools
+%else
+Requires:       python-dateutil >= 1.5
+%endif
+
+Requires:       pytz
+Requires:       python-psycopg2
+
+
+%description
+vertica-python is a native Python adapter for the Vertica
+(http://www.vertica.com) database.
+
+
+%prep
+%setup -q -n vertica-python-%{version}
+
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%patch0 -p1
+%endif
+
+
+%build
+%{__python2} setup.py build
+
+
+%install
+%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+ 
+%files
+%doc README.md LICENSE
+%{python2_sitelib}/*.egg-info
+%dir %{python2_sitelib}/vertica_python
+%{python2_sitelib}/vertica_python/*
+
+
+%changelog
+* Wed Apr 15 2015 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.3.6-1
+- update to version 0.3.6
+
+* Wed Apr 08 2015 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.3.5-1
+- update to version 0.3.5
+
+* Wed Jan 21 2015 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.3.4-1
+- update to version 0.3.4
+
+* Wed Oct 15 2014 Jakub Jedelsky <jakub.jedelsky@gooddata.com> - 0.3.0-1
+- update to version 0.3.0
+
+* Fri Jun 13 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.3-1
+- update to new version
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Apr 24 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.1-1
+- new version update
+
+* Fri Mar 28 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.0-4
+- remove buildrood tag
+- edit dateutil patch for el6
+
+* Wed Mar 26 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.0-3
+- package is not ready for python3 
+
+* Wed Mar 26 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.0-2
+- python-setuptools is required only on rhel<=6
+
+* Mon Mar 24 2014 Jakub Jedelsky <jakub.jedelsky@gmail.com> - 0.2.0-1
+- Initial package