rpms/trac/EL-5 trac-0.10.5-GeneratorExit.patch, NONE, 1.1 trac.spec, 1.17, 1.18

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/trac/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32748

Modified Files:
	trac.spec 
Added Files:
	trac-0.10.5-GeneratorExit.patch 
Log Message:
* Thu Feb 05 2009 Jesse Keating <jkeating at redhat.com> - 0.10.5-2
- Add a patch to deal with GeneratorExit, which is a python-2.5ism (#458236)


trac-0.10.5-GeneratorExit.patch:

--- NEW FILE trac-0.10.5-GeneratorExit.patch ---
diff -up trac-0.10.5/trac/wiki/macros.py.jk trac-0.10.5/trac/wiki/macros.py
--- trac-0.10.5/trac/wiki/macros.py.jk	2009-02-05 15:23:47.952240735 -0800
+++ trac-0.10.5/trac/wiki/macros.py	2009-02-05 15:26:43.964240412 -0800
@@ -33,6 +33,14 @@ from trac.wiki.api import IWikiMacroProv
 from trac.wiki.model import WikiPage
 from trac.web.chrome import add_stylesheet
 
+# Deal with GeneratorExit if necessary (a python-2.5ism)
+try:
+    GeneratorExit
+except NameError:
+    class GeneratorExit(Exception): pass
+
+
+
 
 class WikiMacroBase(Component):
     """Abstract base class for wiki macros."""


Index: trac.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac/EL-5/trac.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- trac.spec	29 Jul 2008 12:52:15 -0000	1.17
+++ trac.spec	5 Feb 2009 23:31:11 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.10.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
 License:        BSD
@@ -17,6 +17,7 @@
 Requires:       subversion >= 1.1
 Requires:       httpd
 Requires:       python-sqlite
+Patch0:         trac-0.10.5-GeneratorExit.patch
 
 %description
 Trac is an integrated system for managing software projects, an
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod -x contrib/*
 sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py
 chmod -x htdocs/js/wikitoolbar.js
@@ -74,6 +76,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Thu Feb 05 2009 Jesse Keating <jkeating at redhat.com> - 0.10.5-2
+- Add a patch to deal with GeneratorExit, which is a python-2.5ism (#458236)
+
 * Sun Jun 22 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.5-1
 - Update to 0.10.5