From: Mateusz Korniak <mateusz-lists@ant.gliwice.pl>
Date: Thu, 12 Jul 2012 14:52:57 +0000 (+0200)
Subject: Release 2. Conflicts with old qbzr versions added.
X-Git-Tag: auto/th/bzr-2.5.1-2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=9db9fe54c24344c56b1fcccd6d94495c72150ce0;hp=7703f1c22b2ca9621f4bd7a36e97a145ba4a5b26;p=packages%2Fbzr.git

Release 2. Conflicts with old qbzr versions added.
---

diff --git a/bzr.spec b/bzr.spec
index ba20f77..47615f6 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -2,7 +2,7 @@ Summary:	Bazaar - a distributed revision control system
 Summary(pl.UTF-8):	Bazaar - rozproszony system kontroli wersji
 Name:		bzr
 Version:	2.5.1
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Development/Version Control
 Source0:	http://launchpad.net/bzr/2.5/%{version}/+download/%{name}-%{version}.tar.gz
@@ -21,6 +21,7 @@ Requires:	python-cElementTree
 Requires:	python-devel-tools
 Requires:	python-paramiko
 Requires:	python-pycurl
+Conflicts:      qbzr < 0.22
 Obsoletes:	bazaar
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)