- updated to 2.4.2

- py27.patch applied upstream in 2.3.2 version

Changed files:
    bzr.spec -> 1.74
    py27.patch -> 1.2

diff --git a/bzr.spec b/bzr.spec
index 6cbc23ecfd8d227d8bcf22f9b96950c37602230e..ca818edf5db9608887a5b6e3c61b271b2aa5602b 100644 (file)
--- a/bzr.spec
+++ b/bzr.spec
@@ -1,14 +1,12 @@
 Summary:       Bazaar - a distributed revision control system
 Summary(pl.UTF-8):     Bazaar - rozproszony system kontroli wersji
 Name:          bzr
-Version:       2.4.0
+Version:       2.4.2
 Release:       1
 License:       GPL v2+
 Group:         Development/Version Control
 Source0:       http://launchpad.net/bzr/2.4/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: 087c65e4b79f454b9e733c21607bdd56
-# from https://bugs.launchpad.net/bzr/+bug/612096
-#Patch0:               py27.patch
+# Source0-md5: cfc06fddd348445c65a247c0b33a05db
 URL:           http://bazaar.canonical.com/
 BuildRequires: python >= 1:2.4
 BuildRequires: python-devel
@@ -76,7 +74,6 @@ This package provides bash-completion for bzr.
 
 %prep
 %setup -q
-#%patch0 -p0
 
 # move out of contrib, as we package contrib as doc
 mv contrib/bash/bzr bash_completion.sh

diff --git a/py27.patch b/py27.patch
deleted file mode 100644 (file)
index 88e67e0..0000000
--- a/py27.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-=== 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
-