From ca9e30c5314d4cbf4044541e1ef4c71ba628f43f Mon Sep 17 00:00:00 2001
From: Henrik Nordström <hno@fedoraproject.org>
Date: Jun 01 2010 22:04:39 +0000
Subject: 2.1.2


---

diff --git a/.cvsignore b/.cvsignore
index 9358361..2f5eb52 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-bzr-2.1.1.tar.gz
-bzr-2.1.1.tar.gz.sig
+bzr-2.1.2.tar.gz
+bzr-2.1.2.tar.gz.sig
diff --git a/bzr.spec b/bzr.spec
index 21ebc81..82add1e 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)
 %define bzrmajor 2.1
-%define bzrminor .1
+%define bzrminor .2
 #define bzrrc rc2
-%define release 2
+%define release 1
 
 # Magics to get the dots in Release string correct per the above
 %global subrelease %{?bzrrc:.}%{?bzrrc}
@@ -29,7 +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
-Patch0: bzr-old-sphinx.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel zlib-devel
@@ -65,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
@@ -138,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_defaultdocdir}/%{name}-doc-%{version}/*
 
 %changelog
+* Tue Jun 01 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 2.1.2-1
+- Upstream 2.1.2 bugfix release
+
 * Mon May 31 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 2.1.1-2
 - 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..7b36f72 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ab6b5e0cc449b27abac2b4d717afe09d  bzr-2.1.1.tar.gz
-46d523784343d1567a7f01ac5eca07ee  bzr-2.1.1.tar.gz.sig
+834d18558b7f3e0f36e3933f8a177506  bzr-2.1.2.tar.gz
+b3816f58951356dc205c70415cfc493a  bzr-2.1.2.tar.gz.sig