diff --git a/paste-unbundle-tempita.patch b/paste-unbundle-tempita.patch index efee461..689973f 100644 --- a/paste-unbundle-tempita.patch +++ b/paste-unbundle-tempita.patch @@ -1,14 +1,16 @@ -diff -uNr Paste-1.7.4.pristine/paste/util/looper/__init__.py Paste-1.7.4/paste/util/looper/__init__.py ---- Paste-1.7.4.pristine/paste/util/looper/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ Paste-1.7.4/paste/util/looper/__init__.py 2010-07-09 19:33:02.704833698 -0400 +Index: Paste-1.7.4/paste/util/looper/__init__.py +=================================================================== +--- /dev/null ++++ Paste-1.7.4/paste/util/looper/__init__.py @@ -0,0 +1,4 @@ +try: + from tempita._looper import * +except ImportError: + from _looper import * -diff -uNr Paste-1.7.4.pristine/paste/util/looper/_looper.py Paste-1.7.4/paste/util/looper/_looper.py ---- Paste-1.7.4.pristine/paste/util/looper/_looper.py 1969-12-31 19:00:00.000000000 -0500 -+++ Paste-1.7.4/paste/util/looper/_looper.py 2010-07-09 19:33:02.716833575 -0400 +Index: Paste-1.7.4/paste/util/looper/_looper.py +=================================================================== +--- /dev/null ++++ Paste-1.7.4/paste/util/looper/_looper.py @@ -0,0 +1,152 @@ +""" +Helper for looping over sequences, particular in templates. @@ -162,9 +164,10 @@ diff -uNr Paste-1.7.4.pristine/paste/util/looper/_looper.py Paste-1.7.4/paste/ut + else: + return item[getter] != other[getter] + -diff -uNr Paste-1.7.4.pristine/paste/util/looper.py Paste-1.7.4/paste/util/looper.py ---- Paste-1.7.4.pristine/paste/util/looper.py 2010-03-31 13:31:32.000000000 -0400 -+++ Paste-1.7.4/paste/util/looper.py 1969-12-31 19:00:00.000000000 -0500 +Index: Paste-1.7.4/paste/util/looper.py +=================================================================== +--- Paste-1.7.4.orig/paste/util/looper.py ++++ /dev/null @@ -1,152 +0,0 @@ -""" -Helper for looping over sequences, particular in templates. @@ -318,17 +321,21 @@ diff -uNr Paste-1.7.4.pristine/paste/util/looper.py Paste-1.7.4/paste/util/loope - else: - return item[getter] != other[getter] - -diff -uNr Paste-1.7.4.pristine/paste/util/template/__init__.py Paste-1.7.4/paste/util/template/__init__.py ---- Paste-1.7.4.pristine/paste/util/template/__init__.py 1969-12-31 19:00:00.000000000 -0500 -+++ Paste-1.7.4/paste/util/template/__init__.py 2010-07-09 19:33:02.733958070 -0400 -@@ -0,0 +1,4 @@ +Index: Paste-1.7.4/paste/util/template/__init__.py +=================================================================== +--- /dev/null ++++ Paste-1.7.4/paste/util/template/__init__.py +@@ -0,0 +1,6 @@ +try: + from tempita import * ++ from tempita import paste_script_template_renderer +except ImportError: + from _template import * -diff -uNr Paste-1.7.4.pristine/paste/util/template/_template.py Paste-1.7.4/paste/util/template/_template.py ---- Paste-1.7.4.pristine/paste/util/template/_template.py 1969-12-31 19:00:00.000000000 -0500 -+++ Paste-1.7.4/paste/util/template/_template.py 2010-07-09 19:33:02.750956498 -0400 ++ from _template import paste_script_template_renderer +Index: Paste-1.7.4/paste/util/template/_template.py +=================================================================== +--- /dev/null ++++ Paste-1.7.4/paste/util/template/_template.py @@ -0,0 +1,758 @@ +""" +A small templating language @@ -1088,9 +1095,10 @@ diff -uNr Paste-1.7.4.pristine/paste/util/template/_template.py Paste-1.7.4/past + fill_command() + + -diff -uNr Paste-1.7.4.pristine/paste/util/template.py Paste-1.7.4/paste/util/template.py ---- Paste-1.7.4.pristine/paste/util/template.py 2010-07-01 21:45:10.198004125 -0400 -+++ Paste-1.7.4/paste/util/template.py 1969-12-31 19:00:00.000000000 -0500 +Index: Paste-1.7.4/paste/util/template.py +=================================================================== +--- Paste-1.7.4.orig/paste/util/template.py ++++ /dev/null @@ -1,758 +0,0 @@ -""" -A small templating language diff --git a/python-paste.spec b/python-paste.spec index 4ea693e..24bfafe 100644 --- a/python-paste.spec +++ b/python-paste.spec @@ -4,7 +4,7 @@ Name: python-paste Version: 1.7.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools for using a Web Server Gateway Interface stack Group: System Environment/Libraries # Most of the code is MIT @@ -72,6 +72,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 30 2010 Toshio Kuratomi - 1.7.4-6 +- Include another function from tempita that is used by paste-script. + * Thu Jul 22 2010 David Malcolm - 1.7.4-5 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild