[packages/python/AC-branch] conflict for db4.5 or bsddb doesn't get built

[glen]

commit 3121a8ce3b05b7cd5b09b1357d768d1d25b3e8d9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 1 16:36:15 2015 +0200

    conflict for db4.5 or bsddb doesn't get built

 python.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/python.spec b/python.spec
index 9bc4f3c..a514ae6 100644
--- a/python.spec
+++ b/python.spec
@@ -55,7 +55,7 @@ Patch6:		%{name}-doc_path.patch
 Patch7:		%{name}-info.patch
 Patch8:		%{name}-bug-978833.patch
 Patch9:		%{name}-db4.6.patch
-Patch10:		linux3.patch
+Patch10:	linux3.patch
 URL:		http://www.python.org/
 BuildRequires:	autoconf
 BuildRequires:	bzip2-devel
@@ -71,11 +71,12 @@ BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	readline-devel >= 5.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
-BuildRequires:	texinfo
 %{?with_info:BuildRequires:	tetex-makeindex}
+BuildRequires:	texinfo
 %{?with_tkinter:BuildRequires:	tix-devel >= 1:8.1.4-4}
 %{?with_tkinter:BuildRequires:	tk-devel >= 8.4.3}
 BuildRequires:	zlib-devel
+BuildConflicts:	db4.5-devel
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Obsoletes:	python-curses
 Obsoletes:	python-gdbm
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python.git/commitdiff/3121a8ce3b05b7cd5b09b1357d768d1d25b3e8d9