From 5a10f901c3700e3462565c57f84140fcb2f6e7f3 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 15 Oct 2014 17:34:29 +0200
Subject: [PATCH] version 0.9.8, upstream feature and bugfix release

---
 .gitignore                                          |  1 +
 python-sqlalchemy-0.9.7-types-test-workaround.patch | 12 ------------
 python-sqlalchemy.spec                              | 11 +++++------
 sources                                             |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 python-sqlalchemy-0.9.7-types-test-workaround.patch

diff --git a/.gitignore b/.gitignore
index 2be3a7b..7d3aed9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ SQLAlchemy-0.6.1.tar.gz
 /SQLAlchemy-0.9.4.tar.gz
 /SQLAlchemy-0.9.6.tar.gz
 /SQLAlchemy-0.9.7.tar.gz
+/SQLAlchemy-0.9.8.tar.gz
diff --git a/python-sqlalchemy-0.9.7-types-test-workaround.patch b/python-sqlalchemy-0.9.7-types-test-workaround.patch
deleted file mode 100644
index fe52d58..0000000
--- a/python-sqlalchemy-0.9.7-types-test-workaround.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py.types-test-workaround SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py
---- SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py.types-test-workaround	2014-07-22 22:54:20.000000000 +0200
-+++ SQLAlchemy-0.9.7/lib/sqlalchemy/sql/elements.py	2014-07-29 16:43:27.921221412 +0200
-@@ -3268,7 +3268,7 @@ class _defer_name(_truncated_label):
-     generation.
- 
-     """
--    def __new__(cls, value):
-+    def __new__(cls, value, *rest):
-         if value is None:
-             return _NONE_NAME
-         elif isinstance(value, conv):
diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec
index c7fb8e5..0d6dfde 100644
--- a/python-sqlalchemy.spec
+++ b/python-sqlalchemy.spec
@@ -10,8 +10,8 @@
 %global srcname SQLAlchemy
 
 Name:           python-sqlalchemy
-Version:        0.9.7
-Release:        2%{?dist}
+Version:        0.9.8
+Release:        1%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
@@ -19,9 +19,6 @@ License:        MIT
 URL:            http://www.sqlalchemy.org/
 Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
 Patch0:         python-sqlalchemy-0.9.7-nose-use-build.patch
-# Work around failing types test
-# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144
-Patch1:         python-sqlalchemy-%{version}-types-test-workaround.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python2-devel >= 2.6
@@ -69,7 +66,6 @@ This package includes the python 3 version of the module.
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1 -b .nose-use-build
-%patch1 -p1 -b .types-test-workaround
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -127,6 +123,9 @@ popd
 %endif # with_python3
 
 %changelog
+* Wed Oct 15 2014 Nils Philippsen <nils@redhat.com> - 0.9.8-1
+- version 0.9.8, upstream feature and bugfix release
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index f2c1a58..9c24845 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3c8f836ea9b48886718f59b9d8646ff  SQLAlchemy-0.9.7.tar.gz
+470ca4da4a0081efc830f0d90dd91682  SQLAlchemy-0.9.8.tar.gz