[python-paste-script] * Fri Jul 30 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7.3-6 - Use system tempita instead

[Toshio くらとみ]

commit 759b722399605a9a08c54b8b19f3592d9152e9ce
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Jul 30 23:46:08 2010 -0400

    * Fri Jul 30 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7.3-6
    - Use system tempita instead of tempita bundled in paste

 paste-script-use-system-tempita.patch |   16 ++++++++++++++++
 python-paste-script.spec              |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/paste-script-use-system-tempita.patch b/paste-script-use-system-tempita.patch
new file mode 100644
index 0000000..21771fe
--- /dev/null
+++ b/paste-script-use-system-tempita.patch
@@ -0,0 +1,16 @@
+Index: PasteScript-1.7.3/paste/script/templates.py
+===================================================================
+--- PasteScript-1.7.3.orig/paste/script/templates.py
++++ PasteScript-1.7.3/paste/script/templates.py
+@@ -6,7 +6,10 @@ import inspect
+ import copydir
+ import command
+ 
+-from paste.util.template import paste_script_template_renderer
++try:
++    from tempita import paste_script_template_renderer
++except ImportError:
++    from paste.util.template import paste_script_template_renderer
+ 
+ class Template(object):
+ 
diff --git a/python-paste-script.spec b/python-paste-script.spec
index 463b6da..8d78031 100644
--- a/python-paste-script.spec
+++ b/python-paste-script.spec
@@ -4,7 +4,7 @@
 
 Name:           python-paste-script
 Version:        1.7.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A pluggable command-line frontend
 Group:          System Environment/Libraries
 # paste/script/wsgiserver/ is BSD licensed from CherryPy
@@ -16,6 +16,7 @@ URL:            http://pythonpaste.org/script
 Source0:        http://pypi.python.org/packages/source/P/PasteScript/PasteScript-%{version}.tar.gz
 Patch0: paste-system-uuid.patch
 Patch1: paste-unbundle.patch
+Patch2: paste-script-use-system-tempita.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -48,6 +49,7 @@ Built-in features:
 %setup -q -n PasteScript-%{version}
 %patch0 -p1 -b .uuid
 %patch1 -p1 -b .unbundle
+%patch2 -p1 -b .tempita
 
 find docs -type f -exec chmod 0644 \{\} \;
 %build
@@ -72,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 30 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.7.3-6
+- Use system tempita instead of tempita bundled in paste
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 1.7.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild