From e81e65ae2f963472c496e0a7a91829564df3eebe Mon Sep 17 00:00:00 2001
From: Mike Bonnet <mikeb@fedoraproject.org>
Date: Sep 15 2009 17:49:44 +0000
Subject: update to the 2.2.2 release


---

diff --git a/cheetah-2.2.2-remove-markdown-dependency.patch b/cheetah-2.2.2-remove-markdown-dependency.patch
new file mode 100644
index 0000000..04c0127
--- /dev/null
+++ b/cheetah-2.2.2-remove-markdown-dependency.patch
@@ -0,0 +1,16 @@
+diff -uNr Cheetah-2.2.2.orig/SetupConfig.py Cheetah-2.2.2/SetupConfig.py
+--- Cheetah-2.2.2.orig/SetupConfig.py	2009-09-14 19:04:00.000000000 -0400
++++ Cheetah-2.2.2/SetupConfig.py	2009-09-15 13:29:26.293920000 -0400
+@@ -58,9 +58,9 @@
+ if not os.getenv('CHEETAH_INSTALL_WITHOUT_SETUPTOOLS'):
+     try:
+         from setuptools import setup
+-        install_requires = [
+-                "Markdown >= 2.0.1",
+-        ]
++        # install_requires = [
++        #         "Markdown >= 2.0.1",
++        # ]
+         if sys.platform == 'win32':
+             # use 'entry_points' instead of 'scripts'
+             del scripts
diff --git a/python-cheetah.spec b/python-cheetah.spec
index 4e6d3c4..8b3ed69 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -1,14 +1,15 @@
 %{!?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.2.1
+Version:        2.2.2
 Release:        1%{?dist}
-Summary:        Template engine and code-generator
+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:         cheetah-2.2.2-remove-markdown-dependency.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -25,14 +26,13 @@ code, Java, sql, form emails and even Python code.
 
 %prep
 %setup -q -n Cheetah-%{version}
+%patch0 -p1
 
 %build
-export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py build
 
 %install
 rm -rf %{buildroot}
-export CHEETAH_USE_SETUPTOOLS=1
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
@@ -71,17 +71,18 @@ rm -rf %{buildroot}
 %dir %{python_sitearch}/Cheetah/Utils
 %{python_sitearch}/Cheetah/Utils/*.py*
 
-%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 Sep 14 2009 Mike Bonnet <mikeb@redhat.com> - 2.2.2-1
+- update to the 2.2.2 release
+- remove dependency on Markdown because it's not available in F-11
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun  5 2009 Mike Bonnet <mikeb@redhat.com> - 2.2.1-1
 - update to the 2.2.1 release
 
diff --git a/sources b/sources
index ee96c9b..9dc73fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-137491aef378b502b2ee71c03b929faf  Cheetah-2.2.1.tar.gz
+e0d89113ab6bb0935d2b67395960264c  Cheetah-2.2.2.tar.gz