[TurboGears2] Update to TG 2.1.4, and get the test suite running again

[Luke Macken]

commit a5f68c35e2362e8d81305d3f4ea9b138348d00e6
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Dec 14 13:09:05 2011 -0500

    Update to TG 2.1.4, and get the test suite running again

 .gitignore             |    1 +
 TurboGears2.spec       |   22 +++++++++++++++++-----
 sources                |    2 +-
 test-templates.tar.bz2 |  Bin 0 -> 2999 bytes
 4 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 47f07cd..7a2536b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ TurboGears2-2.1b2.tar.gz
 /TurboGears2-2.1.tar.gz
 /TurboGears2-2.1.1.tar.gz
 /TurboGears2-2.1.2.tar.gz
+/TurboGears2-2.1.4.tar.gz
diff --git a/TurboGears2.spec b/TurboGears2.spec
index 16fce99..8ecd54d 100644
--- a/TurboGears2.spec
+++ b/TurboGears2.spec
@@ -2,7 +2,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears2
-Version:        2.1.2
+Version:        2.1.4
 Release:        1%{?dist}
 Summary:        Next generation front-to-back web development megaframework built on Pylons
 
@@ -10,6 +10,7 @@ Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://www.turbogears.org/2.1/downloads/%{version}/%{name}-%{version}.tar.gz
+Source1:        test-templates.tar.bz2
 Patch0:         %{name}-kajiki.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,10 +82,16 @@ python setup.py build
 rm -rf %{buildroot}
 python setup.py install --skip-build --root %{buildroot}
 
-#%check
-# TG2 tarball currently doesn't contain everything needed to run tests
-#PYTHONPATH=$(pwd) nosetests -q --exclude=test_304
-#rm -fr %{buildroot}%{python_sitelib}/tests
+%check
+# TG2 tarball currently doesn't contain everything needed to run tests,
+# so we create an additional tarball with the remaining files by running:
+# tar -cjf test-templates.tar.bz2 `find tests -name '*.html' -or -name '*.mak'`
+tar -jxvf %{SOURCE1}
+mkdir tests/test_stack/config/templates
+mkdir tests/test_stack/dispatch/templates
+
+PYTHONPATH=$(pwd) nosetests -q
+rm -fr %{buildroot}%{python_sitelib}/tests
 
 %clean
 rm -rf %{buildroot}
@@ -97,6 +104,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 14 2011 Luke Macken <lmacken at redhat.com> - 2.1.4-1
+- Update to 2.1.4
+- Get the test suite up and running again
+- Add a tarball with some missing templates needed to run the tests
+
 * Thu Aug 25 2011 Luke Macken <lmacken at redhat.com> - 2.1.2-1
 - Update to 2.1.2
 - Update our requirements
diff --git a/sources b/sources
index c5c769c..af623f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56af8d784d0259ede4379b41b5b32c0c  TurboGears2-2.1.2.tar.gz
+d2e2716210308ed9dc35cb190a85635c  TurboGears2-2.1.4.tar.gz
diff --git a/test-templates.tar.bz2 b/test-templates.tar.bz2
new file mode 100644
index 0000000..c73b7ef
Binary files /dev/null and b/test-templates.tar.bz2 differ