[openstack-glance] adjust to support sqlalchemy-0.8.0

[Pádraig Brady]

commit 18e217c7ca475377a5b9eb9aa900a1e6063593c1
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Apr 2 15:17:24 2013 +0100

    adjust to support sqlalchemy-0.8.0

 ...-Don-t-access-the-net-while-building-docs.patch |    4 +-
 ...ecated-assert_unicode-sqlalchemy-attribut.patch |   33 ++++++++++++++++++++
 openstack-glance.spec                              |    7 +++-
 3 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
index 16c14dd..4051755 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -8,8 +8,8 @@ Subject: [PATCH] Don't access the net while building docs
 Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
 (cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
 ---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index 8b546d6..4d73f0d 100644
diff --git a/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch b/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
new file mode 100644
index 0000000..8bf96c5
--- /dev/null
+++ b/0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
@@ -0,0 +1,33 @@
+From 9de86f91b9971108a2d7e1b0901c1d3bf1b974f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
+Date: Tue, 2 Apr 2013 14:34:54 +0100
+Subject: [PATCH] remove deprecated assert_unicode sqlalchemy attribute
+
+Removing this enables use with sqlalchemy 0.8.0
+The deprecation is described upstream at:
+http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79c886d1bb283042deb64f9cbe
+
+Change-Id: Ia34b38245c6abe1ddb4162eee89459a7130deacb
+---
+ glance/db/sqlalchemy/migrate_repo/schema.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glance/db/sqlalchemy/migrate_repo/schema.py b/glance/db/sqlalchemy/migrate_repo/schema.py
+index 1fcf845..54f8808 100644
+--- a/glance/db/sqlalchemy/migrate_repo/schema.py
++++ b/glance/db/sqlalchemy/migrate_repo/schema.py
+@@ -28,12 +28,12 @@ LOG = logging.getLogger(__name__)
+ 
+ 
+ String = lambda length: sqlalchemy.types.String(
+-    length=length, convert_unicode=False, assert_unicode=None,
++    length=length, convert_unicode=False,
+     unicode_error=None, _warn_on_bytestring=False)
+ 
+ 
+ Text = lambda: sqlalchemy.types.Text(
+-    length=None, convert_unicode=False, assert_unicode=None,
++    length=None, convert_unicode=False,
+     unicode_error=None, _warn_on_bytestring=False)
+ 
+ 
diff --git a/openstack-glance.spec b/openstack-glance.spec
index a3bdacc..61ac472 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,6 +1,6 @@
 Name:             openstack-glance
 Version:          2013.1
-Release:          0.7.rc1%{?dist}
+Release:          0.8.rc1%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
@@ -15,6 +15,7 @@ Source3:          openstack-glance.logrotate
 # patches_base=2013.1.rc1
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
+Patch0002: 0002-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -99,6 +100,7 @@ This package contains documentation files for glance.
 %setup -q -n glance-%{version}.rc1
 
 %patch0001 -p1
+%patch0002 -p1
 
 # Remove bundled egg-info
 rm -rf glance.egg-info
@@ -266,6 +268,9 @@ fi
 %doc doc/build/html
 
 %changelog
+* Tue Apr  2 2013 Pádraig Brady <pbrady at redhat.com> 2013.1-0.8.rc1
+- Adjust to support sqlalchemy-0.8.0
+
 * Tue Mar 22 2013 Nikola Đipanov <ndipanov at redhat.com> 2013.1-0.7.rc1
 - Update to Grizzly RC1