diff --git a/bzr.dev-5439-python27.patch b/bzr.dev-5439-python27.patch index cbf3af5..4f31466 100644 --- a/bzr.dev-5439-python27.patch +++ b/bzr.dev-5439-python27.patch @@ -1,6 +1,6 @@ -diff -up bzr-2.2.3/bzrlib/transport/http/_urllib2_wrappers.py.5439 bzr-2.2.3/bzrlib/transport/http/_urllib2_wrappers.py ---- bzr-2.2.3/bzrlib/transport/http/_urllib2_wrappers.py.5439 2011-01-20 21:39:33.000000000 +0100 -+++ bzr-2.2.3/bzrlib/transport/http/_urllib2_wrappers.py 2011-04-28 21:47:57.508486644 +0200 +diff -up bzr-2.2.4/bzrlib/transport/http/_urllib2_wrappers.py.5439 bzr-2.2.4/bzrlib/transport/http/_urllib2_wrappers.py +--- bzr-2.2.4/bzrlib/transport/http/_urllib2_wrappers.py.5439 2011-02-04 13:32:04.000000000 +0100 ++++ bzr-2.2.4/bzrlib/transport/http/_urllib2_wrappers.py 2011-04-28 22:09:24.377398570 +0200 @@ -75,6 +75,26 @@ from bzrlib import ( ) @@ -37,12 +37,12 @@ diff -up bzr-2.2.3/bzrlib/transport/http/_urllib2_wrappers.py.5439 bzr-2.2.3/bzr resp.code = r.status resp.msg = r.reason resp.version = r.version -diff -up bzr-2.2.3/NEWS.5439 bzr-2.2.3/NEWS ---- bzr-2.2.3/NEWS.5439 2011-01-20 21:39:33.000000000 +0100 -+++ bzr-2.2.3/NEWS 2011-04-28 21:49:33.411287693 +0200 -@@ -5,6 +5,12 @@ Bazaar Release Notes - .. contents:: List of Releases - :depth: 1 +diff -up bzr-2.2.4/NEWS.5439 bzr-2.2.4/NEWS +--- bzr-2.2.4/NEWS.5439 2011-02-04 13:32:04.000000000 +0100 ++++ bzr-2.2.4/NEWS 2011-04-28 22:15:01.251187067 +0200 +@@ -135,6 +135,12 @@ This is a bugfix release which also incl + 2.1.3. None are critical, but upgrading is recommended for all users on + earlier 2.2 releases. +Fedora Backported Bug Fixes +*************************** @@ -50,6 +50,6 @@ diff -up bzr-2.2.3/NEWS.5439 bzr-2.2.3/NEWS +* Fix traceback with python-2.7's xmlrpclib + (Toshio Kuratomi, #612096) + - bzr 2.2.3 - ######### + Bug Fixes + ********* diff --git a/bzr.spec b/bzr.spec index 3acc239..d384b69 100644 --- a/bzr.spec +++ b/bzr.spec @@ -11,9 +11,9 @@ # bzrrc: release candidate version, if any, line starts with % for rc, # for stable releas (no %). # release: rpm subrelease (0.N for rc candidates, N for stable releases) %global bzrmajor 2.2 -%global bzrminor .3 +%global bzrminor .4 #global bzrrc b4 -%global release 2 +%global release 1 # Magics to get the dots in Release string correct per the above %global subrelease %{?bzrrc:.}%{?bzrrc} @@ -139,9 +139,12 @@ rm -rf $RPM_BUILD_ROOT %doc %{_defaultdocdir}/%{name}-doc-%{version}/* %changelog -* Sun Mar 20 2011 Henrik Nordstrom - 2.2.4-1 +* Thu Apr 28 2011 Henrik Nordstrom - 2.2.4-1 - Upstream 2.2.4 bugfix release +* Sun Mar 20 2011 Henrik Nordstrom - 2.2.3-1 +- Upstream 2.2.3 bugfix release + * Wed Sep 29 2010 jkeating - 2.2.1-2.1 - Rebuilt for gcc bug 634757