From 50f5e50fad0124f7ad8ffc223ec994ff39b97c24 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 03:25:36 +0000
Subject: [PATCH] auto-import changelog data from bash-2.05-3.src.rpm Thu Feb
 14 2002 Phil Knirsch <pknirsch@redhat.com> - Removed the unecessary chmod
 again as it generates a require loop Mon May 28 2001 Oliver Paukstadt
 <oliver.paukstadt@millenux.com> - added chmod 644 when generated /etc/shells

---
 .cvsignore |  4 ++--
 bash.spec  | 26 ++++++++++++++++----------
 sources    |  4 ++--
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 09a8f19..0c19d88 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-bash-2.04.tar.gz
-bash-doc-2.04.tar.gz
+bash-2.05.tar.gz
+bash-doc-2.05.tar.gz
diff --git a/bash.spec b/bash.spec
index 0775f24..8701273 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,7 +1,7 @@
-Version: 2.04
+Version: 2.05
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 22
+Release: 3
 Group: System Environment/Shells
 Copyright: GPL
 Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{version}.tar.gz
@@ -17,9 +17,7 @@ Patch3: bash-2.03-profile.patch
 Patch5: bash-2.04-requires.patch
 Patch6: bash-2.04-compat.patch
 Patch7: bash-2.04-shellfunc.patch
-Patch8: bash-ia64.patch
-Patch9: bash-2.04-export.patch
-Patch10: bash-2.04-readline-i18n.patch
+Patch10: bash-2.05-s390x-unwind.patch
 Prefix: %{_prefix}
 Requires: mktemp
 Provides: bash2
@@ -58,9 +56,11 @@ Again shell version %{version}.
 %patch5 -p1 -b .requires
 %patch6 -p1 -b .compat
 %patch7 -p1 -b .shellfunc
-%patch8 -p1 -b .ia64
-%patch9 -p0
-%patch10 -p1 -b .readline
+
+%ifarch s390x 
+%patch10 -p1 -b .s390x
+%endif
+
 echo %{version} > _distribution
 echo %{release} > _patchlevel
 
@@ -191,8 +191,14 @@ fi
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
-* Tue May 23 2001 Leon Ho <llch@redhat.com>
-- Applied a patch for readline to support multibyte
+* Thu Feb 14 2002 Phil Knirsch <pknirsch@redhat.com>
+- Removed the unecessary chmod again as it generates a require loop
+
+* Mon May 28 2001 Oliver Paukstadt <oliver.paukstadt@millenux.com>
+- added chmod 644 when generated /etc/shells
+
+* Fri May  4 2001 Oliver Paukstadt <oliver.paukstadt@millenux.com>
+- ported to IBM zSeries (s390x, 64 bit)
 
 * Wed Feb 28 2001 Matt Wilson <msw@redhat.com>
 - don't Prereq: /sbin/install-info!
diff --git a/sources b/sources
index d48f7c5..8c52ffe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-49b548a8b72a4c925ff26930e4c31c6c  bash-2.04.tar.gz
-a9684d1095e7ea1adb8759c3f4fca13d  bash-doc-2.04.tar.gz
+fe40d1633203c1ca6f2a6dfc6d097c48  bash-2.05.tar.gz
+9bb3026e0a7cafcf592eea8f357e9f14  bash-doc-2.05.tar.gz