From f7543701474a084710c0b0be0a0068d91083b436 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: May 22 2008 13:11:24 +0000 Subject: #446420 - COMP_WORDBREAKS settings now works --- diff --git a/bash-3.2-comp_wordbreaks.patch b/bash-3.2-comp_wordbreaks.patch new file mode 100644 index 0000000..aa44f03 --- /dev/null +++ b/bash-3.2-comp_wordbreaks.patch @@ -0,0 +1,26 @@ +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 + #endif + ++#if defined (READLINE) ++#include "bashline.h" ++#endif ++ + #include + #include + +@@ -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; + } + diff --git a/bash.spec b/bash.spec index bd6de94..bf6434e 100644 --- a/bash.spec +++ b/bash.spec @@ -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 @@ Patch132: bash-ulimit-m.patch 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 @@ compliance over previous versions. %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 @@ fi %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Thu May 22 2008 Roman Rakus +- #446420 - COMP_WORDBREAKS settings now works + * Fri Feb 29 2008 Tomas Janousek - 3.2-22 - drop /usr/bin/clear from /etc/skel/.bash_logout as suggested by #429406