packages: bzr/bzr.spec, bzr/py27.patch (NEW) - fix for bug #612096 - release 2

[wiget]

Author: wiget                        Date: Wed Oct  6 16:31:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for bug #612096
- release 2

---- Files affected:
packages/bzr:
   bzr.spec (1.64 -> 1.65) , py27.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/bzr/bzr.spec
diff -u packages/bzr/bzr.spec:1.64 packages/bzr/bzr.spec:1.65
--- packages/bzr/bzr.spec:1.64	Sat Oct  2 23:44:38 2010
+++ packages/bzr/bzr.spec	Wed Oct  6 18:31:50 2010
@@ -3,11 +3,13 @@
 Summary(pl.UTF-8):	Bazaar - rozproszony system kontroli wersji
 Name:		bzr
 Version:	2.2.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Version Control
 Source0:	http://launchpad.net/bzr/2.2/%{version}/+download/%{name}-%{version}.tar.gz
 # Source0-md5:	8a6abd8f888fb3e0845e2044d41a24bc
+# from https://bugs.launchpad.net/bzr/+bug/612096
+Patch0:		py27.patch
 URL:		http://bazaar.canonical.com/
 BuildRequires:	python >= 1:2.4
 BuildRequires:	python-devel
@@ -66,6 +68,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__python} setup.py build
@@ -106,6 +109,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2010/10/06 16:31:50  wiget
+- fix for bug #612096
+- release 2
+
 Revision 1.64  2010/10/02 21:44:38  adamg
 - updated to 2.2.1
 

================================================================
Index: packages/bzr/py27.patch
diff -u /dev/null packages/bzr/py27.patch:1.1
--- /dev/null	Wed Oct  6 18:31:56 2010
+++ packages/bzr/py27.patch	Wed Oct  6 18:31:50 2010
@@ -0,0 +1,40 @@
+=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
+--- bzrlib/transport/http/_urllib2_wrappers.py	2010-05-08 05:56:28 +0000
++++ bzrlib/transport/http/_urllib2_wrappers.py	2010-09-15 02:43:44 +0000
+@@ -75,6 +75,26 @@
+     )
+ 
+ 
++class addinfourl(urllib2.addinfourl):
++    '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
++
++    In python-2.7, xmlrpclib expects that the response object that it receives
++    has a getheader method.  httplib.HTTPResponse provides this but
++    urllib2.addinfourl does not.  Add the necessary functions here, ported to
++    use the internal data structures of addinfourl.
++    '''
++
++    def getheader(self, name, default=None):
++        if self.headers is None:
++            raise httplib.ResponseNotReady()
++        return self.headers.getheader(name, default)
++
++    def getheaders(self):
++        if self.headers is None:
++            raise httplib.ResponseNotReady()
++        return self.headers.items()
++
++
+ class _ReportingFileSocket(object):
+ 
+     def __init__(self, filesock, report_activity=None):
+@@ -656,7 +676,7 @@
+             r = response
+             r.recv = r.read
+             fp = socket._fileobject(r, bufsize=65536)
+-            resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
++            resp = addinfourl(fp, r.msg, req.get_full_url())
+             resp.code = r.status
+             resp.msg = r.reason
+             resp.version = r.version
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bzr/bzr.spec?r1=1.64&r2=1.65&f=u