rpms/bash/devel bash-cond-rmatch.patch, NONE, 1.1 bash.spec, 1.128, 1.129

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8489

Modified Files:
	bash.spec 
Added Files:
	bash-cond-rmatch.patch 
Log Message:
* Fri Jan 19 2007 Tim Waugh <twaugh at redhat.com> 3.2-3
- Back out rmatch change introduced in 3.2 (bug #220087).
- Resolves: rhbz#220087


bash-cond-rmatch.patch:
 execute_cmd.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bash-cond-rmatch.patch ---
--- bash-3.2/execute_cmd.c.cond_rmatch	2007-01-19 16:29:03.000000000 +0000
+++ bash-3.2/execute_cmd.c	2007-01-19 16:29:25.000000000 +0000
@@ -2560,7 +2560,7 @@
       arg1 = cond_expand_word (cond->left->op, 0);
       if (arg1 == 0)
 	arg1 = nullstr;
-      arg2 = cond_expand_word (cond->right->op, patmatch||rmatch);
+      arg2 = cond_expand_word (cond->right->op, patmatch);
       if (arg2 == 0)
 	arg2 = nullstr;
 


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- bash.spec	16 Jan 2007 17:56:07 -0000	1.128
+++ bash.spec	19 Jan 2007 16:35:30 -0000	1.129
@@ -1,7 +1,7 @@
 Version: 3.2
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -34,6 +34,7 @@
 Patch118: bash-tty-tests.patch
 Patch126: bash-setlocale.patch
 Patch130: bash-infotags.patch
+Patch131: bash-cond-rmatch.patch
 Prefix: %{_prefix}
 Requires: mktemp
 Obsoletes: bash2 etcskel
@@ -79,6 +80,7 @@
 %patch118 -p1 -b .tty-tests
 %patch126 -p1 -b .setlocale
 %patch130 -p1 -b .infotags
+%patch131 -p1 -b .cond-rmatch
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -207,6 +209,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Fri Jan 19 2007 Tim Waugh <twaugh at redhat.com> 3.2-3
+- Back out rmatch change introduced in 3.2 (bug #220087).
+
 * Tue Jan 16 2007 Miroslav Lichvar <mlichvar at redhat.com> 3.2-2
 - Link with ncurses.