rpms/bash/devel bash-3.2-comp_wordbreaks.patch, NONE, 1.1 bash.spec, 1.154, 1.155

[Roman Rakus (rrakus)]

Author: rrakus

Update of /cvs/extras/rpms/bash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20652

Modified Files:
	bash.spec 
Added Files:
	bash-3.2-comp_wordbreaks.patch 
Log Message:
#446420 - COMP_WORDBREAKS settings now works

bash-3.2-comp_wordbreaks.patch:

--- NEW FILE bash-3.2-comp_wordbreaks.patch ---
diff -up bash-3.2/shell.c.comp_wordbreaks bash-3.2/shell.c
--- bash-3.2/shell.c.comp_wordbreaks	2008-05-22 13:11:54.000000000 +0200
+++ bash-3.2/shell.c	2008-05-22 13:29:04.000000000 +0200
@@ -71,6 +71,10 @@
 #  include <readline/history.h>
 #endif
 
+#if defined (READLINE)
+#include "bashline.h"
+#endif
+
 #include <tilde/tilde.h>
 #include <glob/strmatch.h>
 
@@ -1729,6 +1733,11 @@ shell_reinitialize ()
   delete_all_contexts (shell_variables);
   delete_all_variables (shell_functions);
 
+#if defined (READLINE)
+  sv_comp_wordbreaks ("COMP_WORDBREAKS");
+  bash_readline_initialized = 0;
+#endif /* READLINE */
+
   shell_reinitialized = 1;
 }
 


Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- bash.spec	29 Feb 2008 14:20:24 -0000	1.154
+++ bash.spec	22 May 2008 13:11:24 -0000	1.155
@@ -1,7 +1,7 @@
 Version: 3.2
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}
-Release: 22%{?dist}
+Release: 23%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -63,6 +63,7 @@
 Patch133: bash-3.2-rng.patch
 Patch136: bash-3.2-344411.patch
 Patch137: bash-3.2-190350.patch
+Patch138: bash-3.2-comp_wordbreaks.patch
 Requires: mktemp
 Requires(post): ncurses
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -135,6 +136,7 @@
 %patch133 -p1 -b .rng.patch
 %patch136 -p1 -b .344411
 %patch137 -p1 -b .190350
+%patch138 -p1 -b .comp_wordbreaks
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -276,6 +278,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu May 22 2008 Roman Rakus <rrakus at redhat.cz>
+- #446420 - COMP_WORDBREAKS settings now works
+
 * Fri Feb 29 2008 Tomas Janousek <tjanouse at redhat.com> - 3.2-22
 - drop /usr/bin/clear from /etc/skel/.bash_logout as suggested by #429406