From 377372e29f77c1d063ce422ffa7da4a793d852ca Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@fedoraproject.org>
Date: May 20 2009 21:34:35 +0000
Subject: update to the 2.2.0 release


---

diff --git a/python-cheetah-import.patch b/python-cheetah-import.patch
deleted file mode 100644
index c0e5fa4..0000000
--- a/python-cheetah-import.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: Cheetah-2.0.1/src/ImportManager.py
-===================================================================
---- Cheetah-2.0.1.orig/src/ImportManager.py
-+++ Cheetah-2.0.1/src/ImportManager.py
-@@ -407,7 +407,13 @@ class ImportManager:
-         __builtin__.__import__ = self.importHook
-         __builtin__.reload = self.reloadHook
-         
--    def importHook(self, name, globals=None, locals=None, fromlist=None):
-+    def importHook(self, name, globals=None, locals=None, fromlist=None, level=None):
-+        ### FIXME: We need to do something with the level argument instead of
-+        # accepting it and not changing behaviour.
-+        # Level decides whether to do relative, absolute, or both styles of
-+        # import.  See this for an explanation of values:
-+        # http://www.python.org/doc/2.5.2/lib/built-in-funcs.html
-+
-         # first see if we could be importing a relative name
-         #print "importHook(%s, %s, locals, %s)" % (name, globals['__name__'], fromlist)
-         _sys_modules_get = sys.modules.get
diff --git a/python-cheetah.spec b/python-cheetah.spec
index b7cbaa6..085a30f 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -1,20 +1,20 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %([ -x %{__python} ] && %{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" || :)}
 
 Name:           python-cheetah
-Version:        2.0.1
-Release:        5%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        Template engine and code-generator
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://cheetahtemplate.org/
 Source:         http://download.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
-Patch0: python-cheetah-import.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools-devel
+BuildRequires: python
+BuildRequires: python-devel
+BuildRequires: python-setuptools
 
 %description
 Cheetah is an open source template engine and code generation tool,
@@ -25,7 +25,6 @@ code, Java, sql, form emails and even Python code.
 
 %prep
 %setup -q -n Cheetah-%{version}
-%patch0 -p1
 
 %build
 export CHEETAH_USE_SETUPTOOLS=1
@@ -34,7 +33,7 @@ export CHEETAH_USE_SETUPTOOLS=1
 %install
 rm -rf %{buildroot}
 export CHEETAH_USE_SETUPTOOLS=1
-%{__python} setup.py install --skip-build --root %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
 export PATH="%{buildroot}/%{_bindir}:$PATH"
@@ -52,48 +51,41 @@ rm -rf %{buildroot}
 %{_bindir}/cheetah-compile
 
 %dir %{python_sitearch}/Cheetah
-%{python_sitearch}/Cheetah/*.py
-%{python_sitearch}/Cheetah/*.pyc
+%{python_sitearch}/Cheetah/*.py*
 %{python_sitearch}/Cheetah/_namemapper.so
-%{python_sitearch}/Cheetah/*.pyo
 
 %dir %{python_sitearch}/Cheetah/Macros
-%{python_sitearch}/Cheetah/Macros/*.py
-%{python_sitearch}/Cheetah/Macros/*.pyc
-%{python_sitearch}/Cheetah/Macros/*.pyo
+%{python_sitearch}/Cheetah/Macros/*.py*
 
 %dir %{python_sitearch}/Cheetah/Templates
-%{python_sitearch}/Cheetah/Templates/*.py
-%{python_sitearch}/Cheetah/Templates/*.pyc
+%{python_sitearch}/Cheetah/Templates/*.py*
 %{python_sitearch}/Cheetah/Templates/*.tmpl
-%{python_sitearch}/Cheetah/Templates/*.pyo
 
 %dir %{python_sitearch}/Cheetah/Tests
-%{python_sitearch}/Cheetah/Tests/*.py
-%{python_sitearch}/Cheetah/Tests/*.pyc
-%{python_sitearch}/Cheetah/Tests/*.pyo
+%{python_sitearch}/Cheetah/Tests/*.py*
 
 %dir %{python_sitearch}/Cheetah/Tools
-%{python_sitearch}/Cheetah/Tools/*.py
-%{python_sitearch}/Cheetah/Tools/*.pyc
+%{python_sitearch}/Cheetah/Tools/*.py*
 %{python_sitearch}/Cheetah/Tools/*.txt
-%{python_sitearch}/Cheetah/Tools/*.pyo
 
 %dir %{python_sitearch}/Cheetah/Utils
-%{python_sitearch}/Cheetah/Utils/*.py
-%{python_sitearch}/Cheetah/Utils/*.pyc
-%{python_sitearch}/Cheetah/Utils/*.pyo
+%{python_sitearch}/Cheetah/Utils/*.py*
 
-%dir %{python_sitearch}/Cheetah/Utils/optik
-%{python_sitearch}/Cheetah/Utils/optik/*.py
-%{python_sitearch}/Cheetah/Utils/optik/*.pyc
-%{python_sitearch}/Cheetah/Utils/optik/*.pyo
+%dir %{python_sitearch}/Cheetah/contrib
+%{python_sitearch}/Cheetah/contrib/*.py*
+
+%dir %{python_sitearch}/Cheetah/contrib/markdown
+%{python_sitearch}/Cheetah/contrib/markdown/*.py*
 
 %dir %{python_sitearch}/Cheetah-%{version}-*.egg-info
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/PKG-INFO
 %{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
 
 %changelog
+* Mon May 18 2009 Mike Bonnet <mikeb@redhat.com> - 2.2.0-1
+- update to the 2.2.0 release
+- remove unneeded importHook() patch, it has been included upstream
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 5f031c3..74c7adf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7845a2950ea850a13c488a26b61ac50a  Cheetah-2.0.1.tar.gz
+f3a912df34d1b04ad80ba7444f55f0c4  Cheetah-2.2.0.tar.gz