[bzr] 2.5.1

[Henrik Nordström]

commit 19b6edf023ba01148b267d3427350675cce0dc8e
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Wed May 30 18:15:30 2012 +0200

    2.5.1

 .gitignore |    2 ++
 bzr.spec   |   11 ++++++-----
 sources    |    5 ++---
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eeca53d..3f141c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ bzr-2.2b4.tar.gz.asc
 /bzr-2.5.0.tar.gz
 /bzr-2.5.0.tar.gz.sig
 /6481
+/bzr-2.5.1.tar.gz
+/bzr-2.5.1.tar.gz.sig
diff --git a/bzr.spec b/bzr.spec
index 6258a5a..df723e5 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -11,7 +11,7 @@
 #   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.5
-%global bzrminor .0
+%global bzrminor .1
 #global bzrrc b6
 %global release 1
 
@@ -26,8 +26,7 @@ URL:            http://www.bazaar-vcs.org/
 Source0:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz
 Source1:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz.sig
 Source2:        bzr-icon-64.png
-Patch0:         bzr-2.5b5-fix_sphinx11_texinfo.patch
-Patch1:		http://bazaar.launchpad.net/~vila/bzr/2.5-integration/diff/6481
+#Patch0:         bzr-2.5b5-fix_sphinx11_texinfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel zlib-devel
@@ -63,8 +62,7 @@ This package contains the documentation for the Bazaar version control system.
 
 %prep
 %setup -q -n %{name}-%{version}%{?bzrrc}
-%patch0 -p1 -b .fix_sphinx11_texinfo
-%patch1 -p0 -b .sphinx_no_debug_trace
+#patch0 -p1 -b .fix_sphinx11_texinfo
 
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
@@ -137,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_defaultdocdir}/%{name}-doc-%{version}/*
 
 %changelog
+* Wed May 30 2012 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.5.1-1
+- Upstream 2.5.1 bugfix release
+
 * Fri Feb 24 2012 Henrik Nordstrom <henrik at henriknordstrom.net> - 2.5.0-1
 - Upstream 2.5.0 stable release
 
diff --git a/sources b/sources
index e7a2a9b..ccee9fd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-44eb47b77995098a28f017e2daa606b6  bzr-2.5.0.tar.gz
-b0d4a26a3dde94f30e142868b896fed5  bzr-2.5.0.tar.gz.sig
-20a8870c63319bb259c29517e4e7d359  6481
+ac5079858364a046071000d5cdccb67b  bzr-2.5.1.tar.gz
+c83dd08dd2c3e27edbab873500d7d6eb  bzr-2.5.1.tar.gz.sig