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- requires "libreadline6- = " + conflicts "readline5-devel-" 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