From 3c570a8132d3d17b03906993bc38cf4ccb8ead0c2b51aa93e587b57baa235159 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Thu, 4 Mar 2010 12:06:09 +0000
Subject: [PATCH] Accepting request 33734 from home:oertel:branches:Base:System

Copy from home:oertel:branches:Base:System/bash via accept of submit request 33734 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/33734
OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=28
---
 bash-4.1-non_void.patch | 11 +++++++++++
 bash.changes            |  6 ++++++
 bash.spec               |  2 ++
 3 files changed, 19 insertions(+)
 create mode 100644 bash-4.1-non_void.patch

diff --git a/bash-4.1-non_void.patch b/bash-4.1-non_void.patch
new file mode 100644
index 0000000..c50b94f
--- /dev/null
+++ b/bash-4.1-non_void.patch
@@ -0,0 +1,11 @@
+--- bashline.c	2010/03/01 23:44:28	1.1
++++ bashline.c	2010/03/01 23:44:47
+@@ -3421,7 +3421,7 @@
+ putx(c)
+      int c;
+ {
+-  putc (c, rl_outstream);
++  return putc (c, rl_outstream);
+ }
+   
+ static int
diff --git a/bash.changes b/bash.changes
index 025268a..1fd41db 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar  2 00:45:53 CET 2010 - ro@suse.de
+
+- fix warning no return statement in function returning non-void
+  to fix build (in bashline.c) 
+
 -------------------------------------------------------------------
 Wed Feb 24 09:55:03 CET 2010 - werner@suse.de
 
diff --git a/bash.spec b/bash.spec
index ab454e4..7591eb0 100644
--- a/bash.spec
+++ b/bash.spec
@@ -63,6 +63,7 @@ Patch24:        readline-6.0-metamode.patch
 Patch30:        readline-6.1-destdir.patch
 Patch40:        bash-4.1-bash.bashrc.dif
 Patch41:        bash-4.1-intr.dif
+Patch42:        bash-4.1-non_void.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc
 %global         _incdir     %{_includedir}
@@ -306,6 +307,7 @@ unset p
 %patch24 -p0 -b .metamode
 %patch40 -p0 -b .bashrc
 %patch41 -p0 -b .intr
+%patch42 -p0 -b .non_void
 %patch0  -p0
 cd ../readline-%{rl_vers}
 for p in ../readline-%{rl_vers}-patches/*; do