rpms/python-cheetah/F-11 cheetah-2.2.2-remove-markdown-dependency.patch, NONE, 1.1 python-cheetah.spec, 1.20, 1.21 sources, 1.9, 1.10

[Mike Bonnet]

Author: mikeb

Update of /cvs/pkgs/rpms/python-cheetah/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24342

Modified Files:
	python-cheetah.spec sources 
Added Files:
	cheetah-2.2.2-remove-markdown-dependency.patch 
Log Message:
update to the 2.2.2 release

cheetah-2.2.2-remove-markdown-dependency.patch:
 SetupConfig.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE cheetah-2.2.2-remove-markdown-dependency.patch ---
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


Index: python-cheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/F-11/python-cheetah.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- python-cheetah.spec	5 Jun 2009 14:54:40 -0000	1.20
+++ python-cheetah.spec	15 Sep 2009 17:49:44 -0000	1.21
@@ -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 Py
 
 %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 at 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 at lists.fedoraproject.org> - 2.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jun  5 2009 Mike Bonnet <mikeb at redhat.com> - 2.2.1-1
 - update to the 2.2.1 release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Jun 2009 14:54:40 -0000	1.9
+++ sources	15 Sep 2009 17:49:44 -0000	1.10
@@ -1 +1 @@
-137491aef378b502b2ee71c03b929faf  Cheetah-2.2.1.tar.gz
+e0d89113ab6bb0935d2b67395960264c  Cheetah-2.2.2.tar.gz