0.3.4 release, fix python3 requires, misc cleanups

.cvsignore

@@ -1 +1 @@
-Mako-0.3.3.tar.gz
+Mako-0.3.4.tar.gz

python-mako.spec

@@ -1,24 +1,28 @@
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
 %global with_python3 1
-
+%else
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 
 Name: python-mako
-Version: 0.3.3
+Version: 0.3.4
 Release: 1%{?dist}
 Summary: Mako template library for Python
 
 Group: Development/Languages
-License: MIT
+# Mostly MIT, but _ast_util.py is Python licensed.
+License: MIT and Python
 URL: http://www.makotemplates.org/
 Source0: http://www.makotemplates.org/downloads/Mako-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-BuildRequires: python-setuptools-devel python-nose
-Requires: python-beaker
+BuildRequires: python-setuptools-devel python-nose python-markupsafe
+Requires: python-beaker python-markupsafe
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
+BuildRequires: python3-markupsafe
 BuildRequires: /usr/bin/2to3
 %endif # if with_python3
 
@@ -36,6 +40,7 @@ calling and scoping semantics.
 %package -n python3-mako
 Summary: Mako template library for Python 3
 Group: Development/Languages
+Requires: python3-beaker python3-markupsafe
 
 %description -n python3-mako
 Mako is a template library written in Python. It provides a familiar, non-XML
@@ -79,6 +84,10 @@ popd
 
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# These are supporting files for building the docs.  Also, they
+# contain files licensed GPLv2 or BSD which confuses the licensing
+# situation.  Just don't ship them.
+rm -rf doc/build
 
 %check
 PYTHONPATH=$(pwd) nosetests
@@ -102,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Jun 27 2010 Kyle VanderBeek <kylev@kylev.com> - 0.3.4-1
+- Update to 0.3.4 security fix release
+- Fix missing python3-beaker dependency
+
 * Sat Jun  5 2010 Kyle VanderBeek <kylev@kylev.com> - 0.3.3-1
 - Update to upstream 0.3.3
 

sources

@@ -1 +1 @@
-2e8fbbb7ea6dc4dde47970cdfd08901e  Mako-0.3.3.tar.gz
+2ae56ccc6c9b5c4e2e67f42b69475009  Mako-0.3.4.tar.gz