From b573b32b52b02fbc7f230949380c3325e563d546 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 4 Jun 2013 18:37:39 +0000
Subject: [PATCH] - add a conflict between readline5 and readline6-32bit

OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=152
---
 baselibs.conf | 1 +
 bash.changes  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/baselibs.conf b/baselibs.conf
index e26c72e5..f50d6e5d 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -8,3 +8,4 @@ targettype x86 package bash
 readline-devel
  requires -readline-<targettype>
  requires "libreadline6-<targettype> = <version>"
+ conflicts "readline5-devel-<targettype>"
diff --git a/bash.changes b/bash.changes
index 17adae6f..0dd3ba9f 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun  4 18:36:43 UTC 2013 - coolo@suse.com
+
+- add a conflict between readline5 and readline6-32bit
+
 -------------------------------------------------------------------
 Tue May 28 15:17:36 UTC 2013 - werner@suse.de