diff --git a/bash-3.2-patches.tar.bz2 b/bash-3.2-patches.tar.bz2 index 252585b9..8b5c5fba 100644 --- a/bash-3.2-patches.tar.bz2 +++ b/bash-3.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:574d5f6430304560b4fdd8938e56e8c73134db02b98797766a3919aff66432c5 -size 6767 +oid sha256:5db45390290cfaf509e50bc727489bce9164b5460183f2d4238203c9c41dd91e +size 13698 diff --git a/bash.changes b/bash.changes index 879c2e1c..572dc471 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 11 14:25:14 CEST 2007 - schwab@suse.de + +- Add bash patches 10-17. + ------------------------------------------------------------------- Sat Aug 4 01:48:42 CEST 2007 - dmueller@suse.de diff --git a/bash.spec b/bash.spec index c59a88d9..43a172e7 100644 --- a/bash.spec +++ b/bash.spec @@ -21,7 +21,7 @@ Requires: /%{_lib}/libreadline.so.%{rl_vers} Recommends: bash-doc = %bash_vers Autoreqprov: on Version: 3.2 -Release: 44 +Release: 49 Summary: The GNU Bourne-Again Shell URL: http://www.gnu.org/software/bash/bash.html Source0: bash-%{bash_vers}.tar.bz2 @@ -47,7 +47,6 @@ Patch21: readline-4.3-input.dif Patch22: readline-5.2-wrap.patch Patch23: readline-5.2-conf.patch Patch30: readline-5.1-destdir.patch -Patch31: readline-5.2-update-line.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,7 +68,7 @@ Summary: Documentation how to Use the GNU Bourne-Again Shell Group: Documentation/Man Provides: bash:/usr/share/info/bash.info.gz Version: 3.2 -Release: 3 +Release: 8 Autoreqprov: on %description -n bash-doc @@ -88,7 +87,7 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.5 Version: 5.2 -Release: 3 +Release: 8 Recommends: readline-doc = %{version} Provides: readline = 5.2 Obsoletes: readline <= 5.2 @@ -111,7 +110,7 @@ Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/C and C++ Provides: bash:/usr/%{_lib}/libreadline.a Version: 5.2 -Release: 44 +Release: 49 Requires: libreadline5 = %{version} Requires: ncurses-devel Requires: /%{_lib}/libhistory.so.%{rl_vers} @@ -135,7 +134,7 @@ Summary: Documentation how to Use and Programm with the Readline Library Group: System/Libraries Provides: readline:/usr/share/info/readline.info.gz Version: 5.2 -Release: 3 +Release: 8 Autoreqprov: on %description -n readline-doc @@ -172,7 +171,7 @@ unset p for p in ../readline-%{rl_vers}-patches/*; do test -e $p || break case "${p##*/}" in - readline52-001) + readline52-00[1234]) echo Patch ${p##*/} already part of bash32-006 continue ;; @@ -195,7 +194,6 @@ done %patch22 -p2 -b .wrap %patch23 -p2 -b .conf %patch30 -p0 -b .destdir -%patch31 -p0 %patch20 -p0 %build @@ -398,6 +396,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_defaultdocdir}/readline/ %changelog +* Sat Aug 11 2007 - schwab@suse.de +- Add bash patches 10-17. * Sat Aug 04 2007 - dmueller@suse.de - fix devel requires * Fri Aug 03 2007 - schwab@suse.de diff --git a/readline-5.2-patches.tar.bz2 b/readline-5.2-patches.tar.bz2 index eeaed56e..50e98612 100644 --- a/readline-5.2-patches.tar.bz2 +++ b/readline-5.2-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4058cf37cbd52558ff6e51ae619444904afd99ce347febb64a1f099c8343318e -size 703 +oid sha256:3694b63750ac3c322d2efb0c2dd8d3687b9d9b9afb3c7f10a4c5ee64c27a1147 +size 2354 diff --git a/readline-5.2-update-line.patch b/readline-5.2-update-line.patch deleted file mode 100644 index 5a8d61e5..00000000 --- a/readline-5.2-update-line.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- display.c 2007/04/11 08:37:02 1.48 -+++ display.c 2007/04/11 08:41:29 -@@ -1589,8 +1589,22 @@ update_line (old, new, current_line, oma - temp = nls - nfd; - if (temp > 0) - { -+ /* If nfd begins at the prompt, or before the invisible -+ characters in the prompt, we need to adjust _rl_last_c_pos -+ in a multibyte locale to account for the wrap offset and -+ set cpos_adjusted accordingly. */ - _rl_output_some_chars (nfd, temp); -- _rl_last_c_pos += _rl_col_width (nfd, 0, temp);; -+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -+ { -+ _rl_last_c_pos += _rl_col_width (nfd, 0, temp); -+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) -+ { -+ _rl_last_c_pos -= wrap_offset; -+ cpos_adjusted = 1; -+ } -+ } -+ else -+ _rl_last_c_pos += temp; - } - } - /* Otherwise, print over the existing material. */ -@@ -1598,8 +1612,20 @@ update_line (old, new, current_line, oma - { - if (temp > 0) - { -+ /* If nfd begins at the prompt, or before the invisible -+ characters in the prompt, we need to adjust _rl_last_c_pos -+ in a multibyte locale to account for the wrap offset and -+ set cpos_adjusted accordingly. */ - _rl_output_some_chars (nfd, temp); - _rl_last_c_pos += col_temp; /* XXX */ -+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -+ { -+ if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible)) -+ { -+ _rl_last_c_pos -= wrap_offset; -+ cpos_adjusted = 1; -+ } -+ } - } - lendiff = (oe - old) - (ne - new); - if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)