From 2948edad380e5b5f44cad16f6ea38abfed633172ac5980c0ec78b9530be74d9f Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Sat, 25 Jun 2016 19:42:38 +0000
Subject: [PATCH] Accepting request 383889 from home:Andreas_Schwab:Factory

- union-wait.patch: don't define BSDWAIT on glibc, future versions will
  remove support for union wait.

OBS-URL: https://build.opensuse.org/request/show/383889
OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=59
---
 tcsh.changes     |  6 ++++++
 tcsh.spec        |  2 ++
 union-wait.patch | 15 +++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 union-wait.patch

diff --git a/tcsh.changes b/tcsh.changes
index 9091267..cc130c9 100644
--- a/tcsh.changes
+++ b/tcsh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr  4 09:00:35 UTC 2016 - schwab@suse.de
+
+- union-wait.patch: don't define BSDWAIT on glibc, future versions will
+  remove support for union wait.
+
 -------------------------------------------------------------------
 Wed Mar 30 11:38:25 UTC 2016 - werner@suse.de
 
diff --git a/tcsh.spec b/tcsh.spec
index 3906de2..971a6cf 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -35,6 +35,7 @@ Patch6:         tcsh-6.18.03-catalogs.dif
 # PATCH-FIX-SUSE add history file locking (bsc#901076)
 Patch9:         tcsh-6.18.03-history-file-locking.patch
 Patch10:        tcsh-6.18.03-history-merge.dif
+Patch11:        union-wait.patch
 BuildRequires:  autoconf
 BuildRequires:  ncurses-devel
 BuildRequires:  screen
@@ -62,6 +63,7 @@ correction, a history mechanism, job control, and a C-like syntax.
 %patch9 -b .histlock
 %patch10 -b .histmerg
 %patch0 -b .0
+%patch11 -p1
 
 %build
 
diff --git a/union-wait.patch b/union-wait.patch
new file mode 100644
index 0000000..35ac872
--- /dev/null
+++ b/union-wait.patch
@@ -0,0 +1,15 @@
+Index: tcsh-6.19.00/sh.proc.c
+===================================================================
+--- tcsh-6.19.00.orig/sh.proc.c
++++ tcsh-6.19.00/sh.proc.c
+@@ -47,8 +47,8 @@ RCSID("$tcsh: sh.proc.c,v 3.127 2015/02/
+ # define HZ 16
+ #endif /* aiws */
+ 
+-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
+-# if !defined(__ANDROID__)
++#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__)
++# if !defined(__ANDROID__) && !defined(__GLIBC__)
+ #  define BSDWAIT
+ # endif
+ #endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */