[TurboGears/el6/master] Fix unittests on el6 and apply patch on el6

[Toshio くらとみ]

commit b2ccfbfa00489016035de81ca5315253f8c4b152
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 20 19:28:16 2011 -0800

    Fix unittests on el6 and apply patch on el6

 TurboGears.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/TurboGears.spec b/TurboGears.spec
index 2fb2107..071d148 100644
--- a/TurboGears.spec
+++ b/TurboGears.spec
@@ -109,7 +109,7 @@ TurboGears is easy to use for a wide range of web applications.
 %patch0 -b .cherrypyreq
 %patch1 -p1 -b .sqlcreate
 %patch2 -p1 -b .feed
-%if 0%{?rhel} && 0%{?rhel} > 6
+%if 0%{?rhel} && 0%{?rhel} >= 6
 %patch100 -p1 -b .deps
 %endif
 
@@ -124,7 +124,7 @@ rm -rf %{buildroot}
 
 %check
 cp %{_bindir}/nosetests .
-sed -i 's/__requires__ =\(.*\)/__requires__ = [\1, "CherryPy \< 3.0a1"]/' nosetests 
+sed -i 's/__requires__ =\(.*\)/__requires__ = [\1, "CherryPy \< 3.0a1", "TurboJson >= 1.3"]/' nosetests 
 
 PYTHONWARNINGS=default PYTHONPATH=$(pwd) ./nosetests -q