[python-sqlobject] Update to 0.14.1 (#630731)

[Luke Macken]

commit 00ea9468453e46a3ccdeaf10841b313eb9413d93
Author: Luke Macken <lmacken at redhat.com>
Date:   Thu Oct 21 13:14:17 2010 -0400

    Update to 0.14.1 (#630731)

 .gitignore                          |    1 +
 python-sqlobject-0.10.2-setup.patch |   11 -----------
 python-sqlobject-0.14.1-setup.patch |   21 +++++++++++++++++++++
 python-sqlobject-deprecation.patch  |   28 ----------------------------
 python-sqlobject.spec               |   12 +++++++-----
 sources                             |    2 +-
 6 files changed, 30 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2647888..5af99d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SQLObject-0.10.2.tar.gz
+SQLObject-0.14.1.tar.gz
diff --git a/python-sqlobject-0.14.1-setup.patch b/python-sqlobject-0.14.1-setup.patch
new file mode 100644
index 0000000..af2e9e8
--- /dev/null
+++ b/python-sqlobject-0.14.1-setup.patch
@@ -0,0 +1,21 @@
+diff -up ./setup.py.orig ./setup.py
+--- ./setup.py.orig	2010-10-21 13:09:36.520035910 -0400
++++ ./setup.py	2010-10-21 13:10:04.288786246 -0400
+@@ -1,13 +1,9 @@
+ # ez_setup doesn't work with Python 2.2, so we use distutils
+ # in that case:
+-try:
+-    from ez_setup import use_setuptools
+-    use_setuptools()
+-    from setuptools import setup
+-    is_setuptools = True
+-except ImportError:
+-    from distutils.core import setup
+-    is_setuptools = False
++from ez_setup import use_setuptools
++use_setuptools()
++from setuptools import setup
++is_setuptools = True
+ 
+ subpackages = ['firebird', 'include', 'include.pydispatch', 'inheritance',
+                'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'rdbhost',
diff --git a/python-sqlobject.spec b/python-sqlobject.spec
index 1df3eeb..0508021 100644
--- a/python-sqlobject.spec
+++ b/python-sqlobject.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-sqlobject
-Version:        0.10.2
-Release:        6%{?dist}
+Version:        0.14.1
+Release:        1%{?dist}
 Summary:        SQLObject -Object-Relational Manager, aka database wrapper  
 
 Group:          Development/Libraries
@@ -10,14 +10,14 @@ License:        LGPLv2+
 URL:            http://sqlobject.org/
 Source0:        http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-%{version}.tar.gz  
 Patch0:         %{name}-%{version}-setup.patch
-Patch1:         %{name}-deprecation.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
-Requires:       python-sqlite2, python-formencode >= 0.2.2
+Requires:       python-sqlite2
+Requires:       python-formencode >= 1.1.1
 Requires:       MySQL-python, postgresql-python
 
 
@@ -32,7 +32,6 @@ installed separately.
 %prep
 %setup -q -n SQLObject-%{version}
 %patch0 -b .setup
-%patch1 -p1 -b .depr
 
 %build
 %{__python} setup.py build
@@ -55,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
+* Thu Oct 21 2010 Luke Macken <lmacken at redhat.com> - 0.14.1-1
+- Update to 0.14.1 (#630731)
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.10.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index d1196f9..17b9dfa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ef1eb9464c08743fd25d8c10dae62af  SQLObject-0.10.2.tar.gz
+cb86134d057244fb5250938b122244e0  SQLObject-0.14.1.tar.gz