rpms/python-mako/EL-5 Makefile, 1.2, 1.3 python-mako.spec, 1.6, 1.7 sources, 1.4, 1.5

[Kyle VanderBeek]

Author: kylev

Update of /cvs/pkgs/rpms/python-mako/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32677

Modified Files:
	Makefile python-mako.spec sources 
Log Message:
Bring the 0.3.4 security fix to EPEL





Index: python-mako.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-mako/EL-5/python-mako.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-mako.spec	4 May 2010 21:40:22 -0000	1.6
+++ python-mako.spec	29 Jun 2010 18:08:34 -0000	1.7
@@ -1,19 +1,30 @@
+%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.2
-Release: 2%{?dist}
+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
-Patch0: changeset_r421_3A1edffe555b6a.diff
 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
 
 %description
 Mako is a template library written in Python. It provides a familiar, non-XML
@@ -25,20 +36,58 @@ componentized layout and inheritance to 
 and flexible models available, while also maintaining close ties to Python
 calling and scoping semantics.
 
+%if 0%{?with_python3}
+%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
+syntax which compiles into Python modules for maximum performance. Mako's
+syntax and API borrows from the best ideas of many others, including Django
+templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded
+Python (i.e. Python Server Page) language, which refines the familiar ideas of
+componentized layout and inheritance to produce one of the most straightforward
+and flexible models available, while also maintaining close ties to Python
+calling and scoping semantics.
+%endif # with_python3
 
 %prep
 %setup -q -n Mako-%{version}
-%patch0 -p0 -b py24
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+2to3 --write --nobackups %{py3dir} %{py3dir}/scripts/mako-render
+%endif # with_python3
 
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT/%{_bindir}/mako-render $RPM_BUILD_ROOT/%{_bindir}/python3-mako-render
+popd
+%endif # with_python3
+
 %{__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
@@ -54,11 +103,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mako-render
 %{python_sitelib}/*
 
+%if 0%{?with_python3}
+%files -n python3-mako
+%defattr(-,root,root,-)
+%{_bindir}/python3-mako-render
+%{python3_sitelib}/*
+%endif
 
 %changelog
-* Tue May 04 2010 Luke Macken <lmacken at redhat.com> - 0.3.2-2
-- Apply patch from upstream to fix Python 2.4 issue
-  http://www.makotemplates.org/trac/ticket/131
+* Sun Jun 27 2010 Kyle VanderBeek <kylev at 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 at kylev.com> - 0.3.3-1
+- Update to upstream 0.3.3
+
+* Tue May  4 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.2-2
+- add python3 subpackage
 
 * Tue May 04 2010 Luke Macken <lmacken at redhat.com> - 0.3.2-1
 - Update to 0.3.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-mako/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 May 2010 21:27:13 -0000	1.4
+++ sources	29 Jun 2010 18:08:34 -0000	1.5
@@ -1 +1 @@
-4fc68467ee226111e102510054ae1e51  Mako-0.3.2.tar.gz
+2ae56ccc6c9b5c4e2e67f42b69475009  Mako-0.3.4.tar.gz