[python-storm] * Fri Jul 30 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.15-4 - Fix test for failing build

[Toshio くらとみ]

commit 4a2d6f07915843c100d77c30d1a64b0396265970
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Jul 30 23:09:15 2010 -0400

    * Fri Jul 30 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.15-4
    - Fix test for failing build

 python-storm.spec                |   11 ++++++++---
 storm-fix-non-ordered-test.patch |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/python-storm.spec b/python-storm.spec
index 981c5a2..109cf07 100644
--- a/python-storm.spec
+++ b/python-storm.spec
@@ -1,8 +1,8 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-storm
 Version:        0.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An object-relational mapper (ORM) for Python
 
 Group:          Development/Languages
@@ -10,11 +10,12 @@ License:        LGPLv2+
 URL:            https://storm.canonical.com/
 Source0:        https://launchpad.net/storm/trunk/%{version}/+download/storm-%{version}.tar.bz2
 Source1:        README-Django.Fedora
+patch0: storm-fix-non-ordered-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # C extension now compiled by default
 #BuildArch:      noarch
-BuildRequires:  python-devel python-setuptools
+BuildRequires:  python2-devel python-setuptools
 
 Provides:       %{name}-sqlite = %{version}-%{release}
 Obsoletes:      %{name}-sqlite  < %{version}-%{release}
@@ -69,6 +70,7 @@ The %{name}-zope package provides Zope integration for %{name}.
 
 %prep
 %setup -q -n storm-%{version}
+%patch0 -p1
 cp -p %{SOURCE1} .
 
 
@@ -120,6 +122,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/storm/databases/postgres.*
 
 %changelog
+* Fri Jul 30 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.15-4
+- Fix test for failing build
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.15-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/storm-fix-non-ordered-test.patch b/storm-fix-non-ordered-test.patch
new file mode 100644
index 0000000..b546c1b
--- /dev/null
+++ b/storm-fix-non-ordered-test.patch
@@ -0,0 +1,14 @@
+diff -up storm-0.15/tests/cache.py.fix storm-0.15/tests/cache.py
+--- storm-0.15/tests/cache.py.fix	2010-07-30 22:56:29.060251004 -0400
++++ storm-0.15/tests/cache.py	2010-07-30 22:57:43.179253171 -0400
+@@ -67,8 +67,8 @@ class BaseCacheTest(TestHelper):
+         cache.add(obj_info2)
+         cache.add(obj_info2)
+         cache.add(obj_info1)
+-        self.assertEquals([hash(obj_info) for obj_info in cache.get_cached()],
+-                          [hash(obj_info1), hash(obj_info2)])
++        self.assertEquals(sorted([hash(obj_info) for obj_info in cache.get_cached()]),
++                          sorted([hash(obj_info1), hash(obj_info2)]))
+ 
+     def test_remove(self):
+         cache = self.Cache(5)