rpms/python-cheetah/devel .cvsignore, 1.9, 1.10 python-cheetah.spec, 1.22, 1.23 sources, 1.9, 1.10

[Mike Bonnet]

Author: mikeb

Update of /cvs/pkgs/rpms/python-cheetah/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19370

Modified Files:
	.cvsignore python-cheetah.spec sources 
Log Message:
update to the 2.2.2 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	5 Jun 2009 14:37:30 -0000	1.9
+++ .cvsignore	15 Sep 2009 16:55:50 -0000	1.10
@@ -1 +1 @@
-Cheetah-2.2.1.tar.gz
+Cheetah-2.2.2.tar.gz


Index: python-cheetah.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/devel/python-cheetah.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-cheetah.spec	26 Jul 2009 20:12:27 -0000	1.22
+++ python-cheetah.spec	15 Sep 2009 16:55:50 -0000	1.23
@@ -1,9 +1,9 @@
 %{!?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
-Release:        2%{?dist}
-Summary:        Template engine and code-generator
+Version:        2.2.2
+Release:        1%{?dist}
+Summary:        Template engine and code generator
 
 Group:          Development/Libraries
 License:        MIT
@@ -16,6 +16,8 @@ BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: python-setuptools
 
+Requires: python-markdown >= 2.0.1
+
 %description
 Cheetah is an open source template engine and code generation tool,
 written in Python. It can be used standalone or combined with other
@@ -27,12 +29,10 @@ code, Java, sql, form emails and even Py
 %setup -q -n Cheetah-%{version}
 
 %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,15 @@ 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
+- add dependency on python-markdown for consistency with the egg-info
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cheetah/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	5 Jun 2009 14:37:30 -0000	1.9
+++ sources	15 Sep 2009 16:55:50 -0000	1.10
@@ -1 +1 @@
-137491aef378b502b2ee71c03b929faf  Cheetah-2.2.1.tar.gz
+e0d89113ab6bb0935d2b67395960264c  Cheetah-2.2.2.tar.gz