From cc6a224b8e5ad9637c7516023045b5c94d7b8024 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Wed, 27 Oct 2010 22:55:37 -0700
Subject: [PATCH] - Use a patch from Debian submitted upstream to convert to
 python3 syntax

---
 mako-make-sure-2to3-is-used.patch | 13 +++++++++++++
 python-mako.spec                  | 11 +++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 mako-make-sure-2to3-is-used.patch

diff --git a/mako-make-sure-2to3-is-used.patch b/mako-make-sure-2to3-is-used.patch
new file mode 100644
index 0000000..34090ba
--- /dev/null
+++ b/mako-make-sure-2to3-is-used.patch
@@ -0,0 +1,13 @@
+Index: mako-0.3.4/setup.py
+===================================================================
+--- mako-0.3.4.orig/setup.py
++++ mako-0.3.4/setup.py
+@@ -64,4 +64,5 @@ ties to Python calling and scoping seman
+       [babel.extractors]
+       mako = mako.ext.babelplugin:extract
+       """,
++      **extra
+ )
+
+
+
diff --git a/python-mako.spec b/python-mako.spec
index 8433112..45fc1e6 100644
--- a/python-mako.spec
+++ b/python-mako.spec
@@ -6,7 +6,7 @@
 
 Name: python-mako
 Version: 0.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mako template library for Python
 
 Group: Development/Languages
@@ -14,6 +14,9 @@ Group: Development/Languages
 License: MIT and Python
 URL: http://www.makotemplates.org/
 Source0: http://www.makotemplates.org/downloads/Mako-%{version}.tar.gz
+# From Debian and submitted upstream by them here:
+# http://www.makotemplates.org/trac/ticket/148
+Patch0: mako-make-sure-2to3-is-used.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-setuptools-devel python-nose python-markupsafe
@@ -56,10 +59,11 @@ calling and scoping semantics.
 %prep
 %setup -q -n Mako-%{version}
 
+%patch0 -p1 -b .2to3
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
-2to3 --write --nobackups %{py3dir} %{py3dir}/scripts/mako-render
 %endif # with_python3
 
 %build
@@ -111,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Oct 27 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.3.5-2
+- Use a patch from Debian submitted upstream to convert to python3 syntax
+
 * Thu Oct 21 2010 Luke Macken <lmacken@redhat.com> - 0.3.5-1
 - Update to 0.3.5 (#645063)