rpms/python-paste-script/devel copydir_re_fix.patch, NONE, 1.1 python-paste-script.spec, 1.17, 1.18

Tue Dec 9 18:23:29 UTC 2008

Author: ivazquez

Update of /cvs/pkgs/rpms/python-paste-script/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17638

Modified Files:
	python-paste-script.spec 
Added Files:
	copydir_re_fix.patch 
Log Message:
Add patch for copydir re error
(http://trac.pythonpaste.org/pythonpaste/ticket/313)


copydir_re_fix.patch:

--- NEW FILE copydir_re_fix.patch ---
Files BUILD.orig//PasteScript-1.6.2/docs/developer.txt and BUILD/PasteScript-1.6.2/docs/developer.txt are identical
Files BUILD.orig//PasteScript-1.6.2/docs/example_app.ini and BUILD/PasteScript-1.6.2/docs/example_app.ini are identical
Files BUILD.orig//PasteScript-1.6.2/docs/example_cgi_app.ini and BUILD/PasteScript-1.6.2/docs/example_cgi_app.ini are identical
Files BUILD.orig//PasteScript-1.6.2/docs/index.txt and BUILD/PasteScript-1.6.2/docs/index.txt are identical
Files BUILD.orig//PasteScript-1.6.2/docs/license.txt and BUILD/PasteScript-1.6.2/docs/license.txt are identical
Files BUILD.orig//PasteScript-1.6.2/docs/news.txt and BUILD/PasteScript-1.6.2/docs/news.txt are identical
Files BUILD.orig//PasteScript-1.6.2/ez_setup.py and BUILD/PasteScript-1.6.2/ez_setup.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/__init__.py and BUILD/PasteScript-1.6.2/paste/__init__.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/appinstall.py and BUILD/PasteScript-1.6.2/paste/script/appinstall.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/bool_optparse.py and BUILD/PasteScript-1.6.2/paste/script/bool_optparse.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/cgi_server.py and BUILD/PasteScript-1.6.2/paste/script/cgi_server.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/checkperms.py and BUILD/PasteScript-1.6.2/paste/script/checkperms.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/cherrypy_server.py and BUILD/PasteScript-1.6.2/paste/script/cherrypy_server.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/command.py and BUILD/PasteScript-1.6.2/paste/script/command.py are identical
diff -Nurbs BUILD.orig//PasteScript-1.6.2/paste/script/copydir.py BUILD/PasteScript-1.6.2/paste/script/copydir.py
--- BUILD.orig//PasteScript-1.6.2/paste/script/copydir.py	2008-02-26 22:51:28.000000000 +0100
+++ BUILD/PasteScript-1.6.2/paste/script/copydir.py	2008-11-14 17:43:32.970966000 +0100
@@ -398,11 +398,19 @@
 class LaxTemplate(string.Template):
     # This change of pattern allows for anything in braces, but
     # only identifiers outside of braces:
-    pattern = re.compile(r"""
+    #pattern = re.compile(r"""
+    #\$(?:
+    #  (?P<escaped>\$)             |   # Escape sequence of two delimiters
+    #  (?P<named>[_a-z][_a-z0-9]*) |   # delimiter and a Python identifier
+    #  {(?P<braced>.*?)}           |   # delimiter and a braced identifier
+    #  (?P<invalid>)                   # Other ill-formed delimiter exprs
+    #)
+    #""", re.VERBOSE | re.IGNORECASE)
+    pattern = r"""
     \$(?:
       (?P<escaped>\$)             |   # Escape sequence of two delimiters
       (?P<named>[_a-z][_a-z0-9]*) |   # delimiter and a Python identifier
       {(?P<braced>.*?)}           |   # delimiter and a braced identifier
       (?P<invalid>)                   # Other ill-formed delimiter exprs
     )
-    """, re.VERBOSE | re.IGNORECASE)
+    """
Files BUILD.orig//PasteScript-1.6.2/paste/script/copydir.pyc and BUILD/PasteScript-1.6.2/paste/script/copydir.pyc differ
Files BUILD.orig//PasteScript-1.6.2/paste/script/create_distro.py and BUILD/PasteScript-1.6.2/paste/script/create_distro.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/default_sysconfig.py and BUILD/PasteScript-1.6.2/paste/script/default_sysconfig.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/entrypoints.py and BUILD/PasteScript-1.6.2/paste/script/entrypoints.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/epdesc.py and BUILD/PasteScript-1.6.2/paste/script/epdesc.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/exe.py and BUILD/PasteScript-1.6.2/paste/script/exe.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/filemaker.py and BUILD/PasteScript-1.6.2/paste/script/filemaker.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/flup_server.py and BUILD/PasteScript-1.6.2/paste/script/flup_server.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/grep.py and BUILD/PasteScript-1.6.2/paste/script/grep.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/help.py and BUILD/PasteScript-1.6.2/paste/script/help.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/__init__.py and BUILD/PasteScript-1.6.2/paste/script/__init__.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/interfaces.py and BUILD/PasteScript-1.6.2/paste/script/interfaces.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/pluginlib.py and BUILD/PasteScript-1.6.2/paste/script/pluginlib.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/request.py and BUILD/PasteScript-1.6.2/paste/script/request.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/serve.py and BUILD/PasteScript-1.6.2/paste/script/serve.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/templates/basic_package/docs/license.txt_tmpl and BUILD/PasteScript-1.6.2/paste/script/templates/basic_package/docs/license.txt_tmpl are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/templates/basic_package/+package+/__init__.py and BUILD/PasteScript-1.6.2/paste/script/templates/basic_package/+package+/__init__.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/templates/basic_package/setup.cfg and BUILD/PasteScript-1.6.2/paste/script/templates/basic_package/setup.cfg are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/templates/basic_package/setup.py_tmpl and BUILD/PasteScript-1.6.2/paste/script/templates/basic_package/setup.py_tmpl are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/templates.py and BUILD/PasteScript-1.6.2/paste/script/templates.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/testapp.py and BUILD/PasteScript-1.6.2/paste/script/testapp.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/twisted_web2_server.py and BUILD/PasteScript-1.6.2/paste/script/twisted_web2_server.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/util/__init__.py and BUILD/PasteScript-1.6.2/paste/script/util/__init__.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/util/logging_config.py and BUILD/PasteScript-1.6.2/paste/script/util/logging_config.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/util/secret.py and BUILD/PasteScript-1.6.2/paste/script/util/secret.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/util/string24.py and BUILD/PasteScript-1.6.2/paste/script/util/string24.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/util/subprocess24.py and BUILD/PasteScript-1.6.2/paste/script/util/subprocess24.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/util/uuid.py and BUILD/PasteScript-1.6.2/paste/script/util/uuid.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/wsgiserver/__init__.py and BUILD/PasteScript-1.6.2/paste/script/wsgiserver/__init__.py are identical
Files BUILD.orig//PasteScript-1.6.2/paste/script/wsgiutils_server.py and BUILD/PasteScript-1.6.2/paste/script/wsgiutils_server.py are identical
Files BUILD.orig//PasteScript-1.6.2/PasteScript.egg-info/dependency_links.txt and BUILD/PasteScript-1.6.2/PasteScript.egg-info/dependency_links.txt are identical
Files BUILD.orig//PasteScript-1.6.2/PasteScript.egg-info/entry_points.txt and BUILD/PasteScript-1.6.2/PasteScript.egg-info/entry_points.txt are identical
Files BUILD.orig//PasteScript-1.6.2/PasteScript.egg-info/namespace_packages.txt and BUILD/PasteScript-1.6.2/PasteScript.egg-info/namespace_packages.txt are identical
Files BUILD.orig//PasteScript-1.6.2/PasteScript.egg-info/not-zip-safe and BUILD/PasteScript-1.6.2/PasteScript.egg-info/not-zip-safe are identical
Files BUILD.orig//PasteScript-1.6.2/PasteScript.egg-info/PKG-INFO and BUILD/PasteScript-1.6.2/PasteScript.egg-info/PKG-INFO are identical
Files BUILD.orig//PasteScript-1.6.2/PasteScript.egg-info/requires.txt and BUILD/PasteScript-1.6.2/PasteScript.egg-info/requires.txt are identical
Files BUILD.orig//PasteScript-1.6.2/PasteScript.egg-info/SOURCES.txt and BUILD/PasteScript-1.6.2/PasteScript.egg-info/SOURCES.txt are identical
Files BUILD.orig//PasteScript-1.6.2/PasteScript.egg-info/top_level.txt and BUILD/PasteScript-1.6.2/PasteScript.egg-info/top_level.txt are identical
Files BUILD.orig//PasteScript-1.6.2/PKG-INFO and BUILD/PasteScript-1.6.2/PKG-INFO are identical
Files BUILD.orig//PasteScript-1.6.2/scripts/paster and BUILD/PasteScript-1.6.2/scripts/paster are identical
Files BUILD.orig//PasteScript-1.6.2/setup.cfg and BUILD/PasteScript-1.6.2/setup.cfg are identical
Files BUILD.orig//PasteScript-1.6.2/setup.py and BUILD/PasteScript-1.6.2/setup.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/appsetup/testfiles/admin_index.py and BUILD/PasteScript-1.6.2/tests/appsetup/testfiles/admin_index.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/appsetup/testfiles/conftest.py and BUILD/PasteScript-1.6.2/tests/appsetup/testfiles/conftest.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/appsetup/testfiles/iscape.txt and BUILD/PasteScript-1.6.2/tests/appsetup/testfiles/iscape.txt are identical
Files BUILD.orig//PasteScript-1.6.2/tests/appsetup/testfiles/test_forbidden.py and BUILD/PasteScript-1.6.2/tests/appsetup/testfiles/test_forbidden.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/appsetup/test_make_project.py and BUILD/PasteScript-1.6.2/tests/appsetup/test_make_project.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/conftest.py and BUILD/PasteScript-1.6.2/tests/conftest.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/fakeplugin/__init__.py and BUILD/PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/fakeplugin/__init__.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/FakePlugin.egg-info/entry_points.txt and BUILD/PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/FakePlugin.egg-info/entry_points.txt are identical
Files BUILD.orig//PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/FakePlugin.egg-info/paster_plugins.txt and BUILD/PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/FakePlugin.egg-info/paster_plugins.txt are identical
Files BUILD.orig//PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/FakePlugin.egg-info/PKG-INFO and BUILD/PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/FakePlugin.egg-info/PKG-INFO are identical
Files BUILD.orig//PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/FakePlugin.egg-info/top_level.txt and BUILD/PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/FakePlugin.egg-info/top_level.txt are identical
Files BUILD.orig//PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/setup.py and BUILD/PasteScript-1.6.2/tests/fake_packages/FakePlugin.egg/setup.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/sample_templates/test1.txt and BUILD/PasteScript-1.6.2/tests/sample_templates/test1.txt are identical
Files BUILD.orig//PasteScript-1.6.2/tests/sample_templates/test2.py_tmpl and BUILD/PasteScript-1.6.2/tests/sample_templates/test2.py_tmpl are identical
Files BUILD.orig//PasteScript-1.6.2/tests/sample_templates/test3.ini_tmpl and BUILD/PasteScript-1.6.2/tests/sample_templates/test3.ini_tmpl are identical
Files BUILD.orig//PasteScript-1.6.2/tests/sample_templates/test4.html_tmpl and BUILD/PasteScript-1.6.2/tests/sample_templates/test4.html_tmpl are identical
Files BUILD.orig//PasteScript-1.6.2/tests/test_egg_finder.py and BUILD/PasteScript-1.6.2/tests/test_egg_finder.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/test_logging_config.py and BUILD/PasteScript-1.6.2/tests/test_logging_config.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/test_plugin_adder.py and BUILD/PasteScript-1.6.2/tests/test_plugin_adder.py are identical
Files BUILD.orig//PasteScript-1.6.2/tests/test_template_introspect.py and BUILD/PasteScript-1.6.2/tests/test_template_introspect.py are identical
Files BUILD.orig//.var.rpmpatch/patches and BUILD/.var.rpmpatch/patches are identical
Files BUILD.orig//.var.rpmpatch/patchname and BUILD/.var.rpmpatch/patchname are identical
Files BUILD.orig//.var.rpmpatch/patchnum and BUILD/.var.rpmpatch/patchnum are identical
Files BUILD.orig//.var.rpmpatch/setupdir and BUILD/.var.rpmpatch/setupdir are identical
Files BUILD.orig//.var.rpmpatch/tmp_patch_2 and BUILD/.var.rpmpatch/tmp_patch_2 are identical


Index: python-paste-script.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-paste-script/devel/python-paste-script.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-paste-script.spec	29 Nov 2008 15:52:14 -0000	1.17
+++ python-paste-script.spec	9 Dec 2008 18:22:58 -0000	1.18
@@ -3,12 +3,13 @@
 
 Name:           python-paste-script
 Version:        1.6.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A pluggable command-line frontend
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://pythonpaste.org/script
 Source0:        http://cheeseshop.python.org/packages/source/P/PasteScript/PasteScript-%{version}.tar.gz
+Patch0:         http://trac.pythonpaste.org/pythonpaste/raw-attachment/ticket/313/copydir_re_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -33,7 +34,7 @@
 
 %prep
 %setup -q -n PasteScript-%{version}
-
+%patch0 -p 2 -b .copydir
 
 %build
 %{__python} setup.py build
@@ -63,6 +64,10 @@
 
 
 %changelog
+* Tue Dec  9 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.3-5
+- Add patch for copydir re error
+-   (http://trac.pythonpaste.org/pythonpaste/ticket/313)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.6.3-4
 - Rebuild for Python 2.6
 


