rpms/PyXML/devel PyXML-0.8.4-python2.6.patch, NONE, 1.1 PyXML.spec, 1.33, 1.34

Wed Dec 24 06:01:56 UTC 2008

Author: trasher

Update of /cvs/extras/rpms/PyXML/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29000

Modified Files:
	PyXML.spec 
Added Files:
	PyXML-0.8.4-python2.6.patch 
Log Message:
Correction for bug #477783


PyXML-0.8.4-python2.6.patch:

--- NEW FILE PyXML-0.8.4-python2.6.patch ---
diff -up PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py.patch PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
--- PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py.patch	2008-12-24 06:35:27.000000000 +0100
+++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-24 06:35:39.000000000 +0100
@@ -24,8 +24,8 @@ class ParsedAbbreviatedAbsoluteLocationP
         self._rel = rel
         nt = ParsedNodeTest.ParsedNodeTest('node', '')
         ppl = ParsedPredicateList.ParsedPredicateList([])
-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-        self._step = ParsedStep.ParsedStep(as, nt, ppl)
+        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+        self._step = ParsedStep.ParsedStep(as_, nt, ppl)
         return
 
     def evaluate(self, context):
diff -up PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py.patch PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py
--- PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py.patch	2008-12-24 06:37:27.000000000 +0100
+++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-24 06:37:48.000000000 +0100
@@ -28,8 +28,8 @@ class ParsedAbbreviatedRelativeLocationP
         self._right = right
         nt = ParsedNodeTest.ParsedNodeTest('node','')
         ppl = ParsedPredicateList.ParsedPredicateList([])
-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
+        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+        self._middle = ParsedStep.ParsedStep(as_, nt, ppl)
 
     def evaluate(self, context):
         res = []


Index: PyXML.spec
===================================================================
RCS file: /cvs/extras/rpms/PyXML/devel/PyXML.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- PyXML.spec	29 Nov 2008 17:46:53 -0000	1.33
+++ PyXML.spec	24 Dec 2008 06:01:25 -0000	1.34
@@ -1,11 +1,12 @@
-Summary: XML libraries for python.
+Summary: XML libraries for python
 Name: PyXML
 Version: 0.8.4
-Release: 11
+Release: 12
 Source: http://prdownloads.sourceforge.net/pyxml/PyXML-%{version}.tar.gz
 Patch0: PyXML-0.7.1-intern.patch
 Patch1: PyXML-0.8.4-cvs20041111-python2.4-backport.patch
 Patch2: PyXML-memmove.patch
+Patch3: PyXML-0.8.4-python2.6.patch
 License: MIT and Python and ZPLv1.0 and BSD
 Group: Development/Libraries
 Requires: python
@@ -40,6 +41,7 @@
 %patch0 -p1 -b .intern
 %patch1 -p1 -b .python2.4-backport
 %patch2 -p1
+%patch3 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build  --with-xslt
@@ -60,6 +62,9 @@
 %{_libdir}/python?.?/site-packages/_xmlplus
 
 %changelog
+* Wed Dec 24 2008 Johan Cwiklinski <johan AT x-tnd DOT be> - 0.8.4-12
+- Patch for 'as' reserved keyword (bug #477783)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.8.4-11
 - Rebuild for Python 2.6
 
@@ -148,16 +153,16 @@
 * Wed Dec 11 2002 Tim Powers <timp at redhat.com> 0.7.1-7
 - lib64'ize
 
-* Thu Aug 29 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-6
+* Thu Aug 29 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 0.7.1-6
 - Reenable expat. While most code works, some specify expat directly
   and fails. Fix #72698, but there is still broken code there (it just 
   goes on to other errors)
 
-* Tue Aug 27 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-5
+* Tue Aug 27 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 0.7.1-5
 - Disable expat support. Other parsers are included. Broken here, 
   broken in 0.8.0. This fixes #72698
 
-* Fri Jun 28 2002 Trond Eivind Glomsrød <teg at redhat.com>
+* Fri Jun 28 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - A fix for the expatreader
 
 * Fri Jun 21 2002 Tim Powers <timp at redhat.com>
@@ -166,40 +171,40 @@
 * Thu May 23 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Fri May 10 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7.1-1
+* Fri May 10 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 0.7.1-1
 - 0.7.1
 
-* Tue Feb 26 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-4
+* Tue Feb 26 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 0.7-4
 - Rebuild
 
-* Mon Jan 21 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-3
+* Mon Jan 21 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 0.7-3
 - Remove xpath, xslt - use the ones in 4Suite
 - patch the build script, it's broken
 
 * Wed Jan 09 2002 Tim Powers <timp at redhat.com>
 - automated rebuild
 
-* Tue Jan  1 2002 Trond Eivind Glomsrød <teg at redhat.com> 0.7-1
+* Tue Jan  1 2002 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 0.7-1
 - PyXML 0.7
 
-* Wed Dec  5 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.6.6-2
+* Wed Dec  5 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 0.6.6-2
 - Add .pyo files
 - Don't hardcode python version
 
-* Tue Sep 18 2001 Trond Eivind Glomsrød <teg at redhat.com> 0.6.6-1
+* Tue Sep 18 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com> 0.6.6-1
 - 0.6.6
 - Build for python 2.2
 
-* Tue Jul 24 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jul 24 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - Add python-devel to BuildRequires (#49820)
 
-* Tue Jul 10 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Jul 10 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - Mark the locale-specific files as such
 
-* Thu Jun  7 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Jun  7 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - Don't obsolete itself
 
-* Mon May  7 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon May  7 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - Initial build, it's no longer part of 4Suite
 
 


