sqlalchemy 0.8+ fix

diff --git a/python-elixir.spec b/python-elixir.spec
index 4d9f82235f4ca53a10ce4dc93b6e8398b8bfad7c..4dba670daf20bbd539b1dbdf826345df9c08e064 100644 (file)
--- a/python-elixir.spec
+++ b/python-elixir.spec
@@ -3,16 +3,17 @@ Summary:      Declarative layer on top of the SQLAlchemy library
 Summary(pl.UTF-8):     Warstwa nad biblioteką SQLAlchemy.
 Name:          python-%{module}
 Version:       0.7.1
-Release:       3
+Release:       4
 License:       MIT
 Group:         Development/Languages/Python
-Source0:       http://pypi.python.org/packages/source/E/Elixir/Elixir-%{version}.tar.gz
+Source0:       https://pypi.python.org/packages/source/E/Elixir/Elixir-%{version}.tar.gz
 # Source0-md5: 5615ec9693e3a8e44f69623d58f54116
+Patch0:                sqlalchemy-0.8.patch
 URL:           http://elixir.ematia.de/trac/wiki
 BuildRequires: python-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
-Requires:      python-SQLAlchemy
+Requires:      python-sqlalchemy >= 0.8
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,6 +33,7 @@ zalet tradycyjnych baz danych bez straty wygody obiektów Pythonowych.
 
 %prep
 %setup -q -n Elixir-%{version}
+%patch0 -p1
 
 %build
 CFLAGS="%{rpmcflags}" \

diff --git a/sqlalchemy-0.8.patch b/sqlalchemy-0.8.patch
new file mode 100644 (file)
index 0000000..b62ebc8
--- /dev/null
+++ b/sqlalchemy-0.8.patch
@@ -0,0 +1,15 @@
+http://stackoverflow.com/questions/14201210/impossible-to-initialize-elixir
+
+--- Elixir-0.7.1/elixir/entity.py~     2009-11-13 21:50:38.000000000 +0200
++++ Elixir-0.7.1/elixir/entity.py      2015-02-11 21:04:09.963209077 +0200
+@@ -15,8 +15,9 @@
+ from sqlalchemy import Table, Column, Integer, desc, ForeignKey, and_, \
+                        ForeignKeyConstraint
+ from sqlalchemy.orm import MapperExtension, mapper, object_session, \
+-                           EXT_CONTINUE, polymorphic_union, ScopedSession, \
++                           EXT_CONTINUE, polymorphic_union, \
+                            ColumnProperty
++from sqlalchemy.orm import scoped_session as ScopedSession
+ from sqlalchemy.sql import ColumnCollection
+ 
+ import elixir