[bzr] bzr-2.6.0

[Henrik Nordström]

commit bd8ff2d723b3475e9370219ae92af906ec44dbf4
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Sat Jul 27 16:50:33 2013 +0200

    bzr-2.6.0

 .gitignore                   |    2 +
 bzr-cve2013-2099.patch       |   21 --------------------
 bzr-gpg-no-agent-error.patch |   44 ------------------------------------------
 bzr-unicode.patch            |   32 ------------------------------
 bzr.spec                     |   21 +++++--------------
 sources                      |    4 +-
 6 files changed, 10 insertions(+), 114 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f141c2..9b8e0d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,5 @@ bzr-2.2b4.tar.gz.asc
 /6481
 /bzr-2.5.1.tar.gz
 /bzr-2.5.1.tar.gz.sig
+/bzr-2.6.0.tar.gz
+/bzr-2.6.0.tar.gz.sig
diff --git a/bzr.spec b/bzr.spec
index 8a1e648..423a16d 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -10,10 +10,10 @@
 #   Version: bzr version, add subrelease version here
 #   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 .1
+%global bzrmajor 2.6
+%global bzrminor .0
 #global bzrrc b6
-%global release 13
+%global release 1
 
 Name:           bzr
 Version:        %{bzrmajor}%{?bzrminor}
@@ -26,15 +26,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
-# Fixed upstream here: https://bugs.launchpad.net/bzr/+bug/1182124
-Patch0:         bzr-cve2013-2099.patch
-# Fix for gpg signing when no gpg agent is present:
-# https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/1014570
-Patch1: bzr-gpg-no-agent-error.patch
-# Traceback when doing bzr version
-# https://bugs.launchpad.net/bzr/+bug/1195783
-# https://bugzilla.redhat.com/show_bug.cgi?id=979399
-Patch2: bzr-unicode.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python2-devel zlib-devel
@@ -71,9 +62,6 @@ This package contains the documentation for the Bazaar version control system.
 
 %prep
 %setup -q -n %{name}-%{version}%{?bzrrc}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py
@@ -155,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_defaultdocdir}/%{name}-doc-%{version}/*
 
 %changelog
+* Sat Jul 27 2013 Henrik Nordstrom <henirk at henriknordstrom.net> - 2.6.0-1
+- Upstream 2.6.0 release
+
 * Fri Jun 28 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 2.5.1-13
 - Fix for unicode traceback when doing bzr version
   https://bugzilla.redhat.com/show_bug.cgi?id=979399
diff --git a/sources b/sources
index ccee9fd..4b2687d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ac5079858364a046071000d5cdccb67b  bzr-2.5.1.tar.gz
-c83dd08dd2c3e27edbab873500d7d6eb  bzr-2.5.1.tar.gz.sig
+28c86653d0df10d202c6b842deb0ea35  bzr-2.6.0.tar.gz
+0a4cb1ef44a20430035940ea4a724cb0  bzr-2.6.0.tar.gz.sig