[bzr/el5] Upstream bugfix at the request of upstream.

[Toshio くらとみ]

commit 3fdc8a0e1c7b00abcb078ca34fc6a92047e67f3f
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Oct 6 12:52:59 2011 -0700

    Upstream bugfix at the request of upstream.

 .gitignore           |    1 +
 bzr-old-sphinx.patch |   95 --------------------------------------------------
 bzr.spec             |   11 +++---
 sources              |    3 +-
 4 files changed, 7 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9358361..7986384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 bzr-2.1.1.tar.gz
 bzr-2.1.1.tar.gz.sig
+/bzr-2.1.4.tar.gz
diff --git a/bzr.spec b/bzr.spec
index e6f5e99..cebd73f 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.1
-%global bzrminor .1
+%global bzrminor .4
 #global bzrrc rc2
-%global release 4
+%global release 1
 
 # Magics to get the dots in Release string correct per the above
 %global subrelease %{?bzrrc:.}%{?bzrrc}
@@ -29,9 +29,6 @@ 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
-# Merged upstream
-# https://bugs.launchpad.net/bzr/+bug/534330
-Patch0: bzr-old-sphinx.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel zlib-devel
@@ -67,7 +64,6 @@ This package contains the documentation for the Bazaar version control system.
 
 %prep
 %setup -q -n %{name}-%{version}%{?bzrrc}
-%patch0 -p0 -b .oldsphinx
 
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
@@ -140,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_defaultdocdir}/%{name}-doc-%{version}/*
 
 %changelog
+* Thu Oct 6 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1.4-1
+- Upstream bugfix at the request of upstream.
+
 * Mon May 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.1.1-4
 - Add an icon for bzr.  This lets the gtk and qbzr plugins share the same icon
   for things like associating an image with a file type.
diff --git a/sources b/sources
index 2393ef0..8d59e56 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ab6b5e0cc449b27abac2b4d717afe09d  bzr-2.1.1.tar.gz
-46d523784343d1567a7f01ac5eca07ee  bzr-2.1.1.tar.gz.sig
+294953f96227e8d3ebec46d7b0908da0  bzr-2.1.4.tar.gz