[griffith/f16] Fix bug #730573. Upgrade of sqlalchemy package caused an api break modified: griffith.spec new f

[Lakshmi Narasimhan T V]

commit 867614b8128a3cd278434962d032de47cdee7f04
Author: Lakshmi Narasimhan <lakshminaras2002 at gmail.com>
Date:   Sun Sep 18 15:08:36 2011 +0530

    Fix bug #730573. Upgrade of sqlalchemy package caused an api break
    	modified:   griffith.spec
    	new file:   sqlalchemy_0.7_upgrade.patch

 griffith.spec                |    7 ++++++-
 sqlalchemy_0.7_upgrade.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/griffith.spec b/griffith.spec
index b46f797..f1f0f4c 100644
--- a/griffith.spec
+++ b/griffith.spec
@@ -1,6 +1,6 @@
 Name:           griffith
 Version:        0.12.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Media collection manager
 
 Group:          Applications/Multimedia
@@ -21,6 +21,7 @@ Requires:       python-imaging
 Requires:       python-reportlab
 Requires:       gnome-python2-gtkspell
 Patch1:         tree_view_fix.patch
+Patch2:         sqlalchemy_0.7_upgrade.patch
 
 
 %description
@@ -37,6 +38,7 @@ This Version comes with SQLite support. You need to install
 %prep
 %setup -q 
 %patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
 
 find -iname "*.mo" -exec rm -f {} \;
 
@@ -88,6 +90,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 18 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.1-3
+- Fix crash issue #730573. Upgrade of sqlalchemy caused an api break.
+
 * Wed Mar 23 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.1-2
 - Fix issue with crash #bug 676195
 
diff --git a/sqlalchemy_0.7_upgrade.patch b/sqlalchemy_0.7_upgrade.patch
new file mode 100644
index 0000000..b65410f
--- /dev/null
+++ b/sqlalchemy_0.7_upgrade.patch
@@ -0,0 +1,36 @@
+diff -ur griffith-0.12.1_old/lib/add.py griffith-0.12.1/lib/add.py
+--- griffith-0.12.1_old/lib/add.py	2010-10-03 17:52:04.000000000 +0530
++++ griffith-0.12.1/lib/add.py	2011-09-18 14:50:46.526267975 +0530
+@@ -26,7 +26,7 @@
+ import os
+ 
+ import gtk
+-from sqlalchemy.exceptions import IntegrityError
++from sqlalchemy.exc import IntegrityError
+ 
+ import quick_filter
+ import db
+diff -ur griffith-0.12.1_old/lib/preferences.py griffith-0.12.1/lib/preferences.py
+--- griffith-0.12.1_old/lib/preferences.py	2010-10-01 00:19:05.000000000 +0530
++++ griffith-0.12.1/lib/preferences.py	2011-09-18 14:50:58.532125576 +0530
+@@ -492,7 +492,7 @@
+             old['name'] != c.get('name', section='database'):
+         log.info('DATABASE: connecting to new db server...')
+         import sql
+-        from sqlalchemy.exceptions import InvalidRequestError
++        from sqlalchemy.exc import InvalidRequestError
+         from initialize import dictionaries, people_treeview
+ 
+         # new database connection
+diff -ur griffith-0.12.1_old/lib/sql.py griffith-0.12.1/lib/sql.py
+--- griffith-0.12.1_old/lib/sql.py	2010-09-20 23:20:30.000000000 +0530
++++ griffith-0.12.1/lib/sql.py	2011-09-18 14:51:14.024937883 +0530
+@@ -29,7 +29,7 @@
+ import os.path
+ 
+ from sqlalchemy import create_engine, or_, and_, not_, exists, asc, desc
+-from sqlalchemy.exceptions import OperationalError
++from sqlalchemy.exc import OperationalError
+ from sqlalchemy.orm import sessionmaker, scoped_session
+ from sqlalchemy.sql.expression import Update, Delete
+