From d4afbf735b949f632d2c886dbad96c8da8326809 Mon Sep 17 00:00:00 2001 From: William Moreno Reyes Date: Mar 11 2016 19:08:22 +0000 Subject: v1.10.5 Signed-off-by: William Moreno Reyes --- diff --git a/.gitignore b/.gitignore index b97590a..73d5eee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /1.10.3.tar.gz /pg8000-1.10.4.tar.gz +/pg8000-1.10.5.tar.gz diff --git a/pg8000-license.patch b/pg8000-license.patch deleted file mode 100644 index 2f7efa7..0000000 --- a/pg8000-license.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -urN ../pg8000-origen/LICENSE ./LICENSE ---- ../pg8000-origen/LICENSE 1969-12-31 18:00:00.000000000 -0600 -+++ ./LICENSE 2016-03-02 17:19:25.085702962 -0600 -@@ -0,0 +1,27 @@ -+Copyright (c) 2007-2009, Mathieu Fenniak -+All rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are -+met: -+ -+* Redistributions of source code must retain the above copyright notice, -+this list of conditions and the following disclaimer. -+* Redistributions in binary form must reproduce the above copyright notice, -+this list of conditions and the following disclaimer in the documentation -+and/or other materials provided with the distribution. -+* The name of the author may not be used to endorse or promote products -+derived from this software without specific prior written permission. -+ -+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+POSSIBILITY OF SUCH DAMAGE. -+ diff --git a/python-pg8000.spec b/python-pg8000.spec index bf04da7..0ce5bba 100644 --- a/python-pg8000.spec +++ b/python-pg8000.spec @@ -1,14 +1,12 @@ %global pypi pg8000 Name: python-%{pypi} -Version: 1.10.4 +Version: 1.10.5 Release: 1%{?dist} Summary: Pure Python PostgreSQL Driver License: BSD URL: http://pythonhosted.org/pg8000/ -Source0: https://github.com/mfenniak/%{pypi}/archive/%{pypi}-%{version}.tar.gz -#https://github.com/tlocke/pg8000/pull/1 -Patch1: pg8000-license.patch +Source0: https://pypi.python.org/packages/source/p/pg8000/pg8000-%{version}.tar.gz BuildArch: noarch @@ -21,9 +19,10 @@ Frontend Protocol. Summary: Pure Python2 PostgreSQL Driver BuildRequires: python2-devel BuildRequires: python-six +BuildRequires: python-setuptools Requires: python-six -Suggests: python2-sqlalchemy -Suggests: postgresql +%{?fedora:Suggests: python2-sqlalchemy} +%{?fedora:Suggests: postgresql} %{?python_provide:%python_provide python2-%{pypi}} %description -n python2-%{pypi} @@ -31,24 +30,33 @@ pg8000 is a pure Python2 PostgreSQL driver that complies with DB-API 2.0. The driver communicates with the database using the PostgreSQL Backend / Frontend Protocol. -%package -n python3-%{pypi} +%package -n python%{python3_pkgversion}-%{pypi} Summary: Pure Python3 PostgreSQL Driver -BuildRequires: python3-devel -BuildRequires: python3-six -Requires: python3-six -Suggests: python3-sqlalchemy -Suggests: postgresql -%{?python_provide:%python_provide python3-%{pypi}} - -%description -n python3-%{pypi} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-six +BuildRequires: python%{python3_pkgversion}-setuptools +Requires: python%{python3_pkgversion}-six +%{?fedora:Suggests: python3-sqlalchemy} +%{?fedora:Suggests: postgresql} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi}} + +%description -n python%{python3_pkgversion}-%{pypi} pg8000 is a pure Python3 PostgreSQL driver that complies with DB-API 2.0. The driver communicates with the database using the PostgreSQL Backend / Frontend Protocol. +%if 0%{?fedora} +%package docs +Summary: HTML documentation for %{name} +BuildRequires: python-sphinx + +%description docs +HTML documentation for pg8000, a pure Python2 and Python3 PostgreSQL +driver that complies with DB-API 2.0. +%endif + %prep -%setup -q -n %{pypi}-%{version} -rm -rf *egg.info -%patch1 +%autosetup -n %{pypi}-%{version} %build %py2_build @@ -58,6 +66,12 @@ rm -rf *egg.info %py2_install %py3_install +%if 0%{?fedora} +%{__python2} setup.py build_sphinx +rm -rf build/sphinx/html/.buildinfo +rm -rf build/sphinx/html/_static/__tmp__.txt +%endif + %check #Test requires a runing PostgreSQL instance @@ -66,14 +80,29 @@ rm -rf *egg.info %doc README.creole %{python2_sitelib}/* -%files -n python3-%{pypi} +%files -n python%{python3_pkgversion}-%{pypi} %license LICENSE %doc README.creole %{python3_sitelib}/* +%if 0%{?fedora} +%files docs +%license LICENSE +%doc build/sphinx/html/* +%endif + %changelog +* Fri Mar 11 2016 William Moreno - 1.10.5-1 +- Update to 1.10.5 +- Remove patch included in upstream release +- Build docs in Fedora builds +- Update Source0 link + +* Wed Mar 02 2016 William Moreno - 1.10.4-1 +- Epel7 packaging of version 1.10.4 + * Tue Mar 01 2016 William Moreno - 1.10.4-1 -- Upadete to 1.10.4 +- Update to 1.10.4 - Remove patch1 included in upstream release - Change source name - Remove doc subpackage, upstream remove source in this release diff --git a/sources b/sources index 2c8ead7..7fb5cfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -365df2347be25f1d73305cbc43f73378 pg8000-1.10.4.tar.gz +f925d4a50f1fea5ff4417cb55e3b264d pg8000-1.10.5.tar.gz