Accepting request 177600 from Base:System

- add a conflict between readline5 and readline6-32bit

- Do not restart the sighandler after a trap is reset (bnc#820149)

OBS-URL: https://build.opensuse.org/request/show/177600
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=108

baselibs.conf

@@ -8,3 +8,4 @@ targettype x86 package bash
 readline-devel
  requires -readline-<targettype>
  requires "libreadline6-<targettype> = <version>"
+ conflicts "readline5-devel-<targettype>"

bash-4.2-sigrestart.patch

@@ -19,7 +19,7 @@
    if (sig == SIGCHLD)
      act.sa_flags |= SA_RESTART;		/* XXX */
 +#if !defined(MUST_REINSTALL_SIGHANDLERS)
-+  if (sig != SIGALRM)
++  if (sig != SIGALRM && handler != (termsig_sighandler))
 +    act.sa_flags |= SA_RESTART;		/* XXX */
 +  if (handler == (trap_handler))
 +    act.sa_flags |= SA_NODEFER;		/* XXX */

bash.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
+
+- Do not restart the sighandler after a trap is reset (bnc#820149)
+
 -------------------------------------------------------------------
 Thu Mar 21 11:51:54 UTC 2013 - werner@suse.de