1
0

Accepting request 962071 from shells

- remove PS1-completion-boo903362.patch as it breaks on non-bash
  shells and the original problem in 
  bsc#903362#c9 does not occur anymore
- add versioned dependency to bash versions that have the fix (forwarded request 962002 from dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/962071
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash-completion?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2022-03-18 15:41:22 +00:00 committed by Git OBS Bridge
commit b84eac02a2
3 changed files with 10 additions and 20 deletions

View File

@ -1,16 +0,0 @@
---
bash_completion.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: bash-completion-2.11/bash_completion.sh.in
===================================================================
--- bash-completion-2.11.orig/bash_completion.sh.in
+++ bash-completion-2.11/bash_completion.sh.in
@@ -1,6 +1,6 @@
# shellcheck shell=sh disable=SC1091,SC2039,SC2166
# Check for interactive bash and that we haven't already been sourced.
-if [ "x${BASH_VERSION-}" != x -a "x${PS1-}" != x -a "x${BASH_COMPLETION_VERSINFO-}" = x ]; then
+if [[ -n "${BASH_VERSION-}" && $- = *i* && -z "${BASH_COMPLETION_VERSINFO-}" ]]; then
# Check for recent enough version of bash.
if [ "${BASH_VERSINFO[0]}" -gt 4 ] ||

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jan 28 19:19:55 UTC 2022 - Dirk Müller <dmueller@suse.com>
- remove PS1-completion-boo903362.patch as it breaks on non-bash
shells and the original problem in
bsc#903362#c9 does not occur anymore
- add versioned dependency to bash versions that have the fix
-------------------------------------------------------------------
Mon Oct 4 13:42:40 UTC 2021 - Dr. Werner Fink <werner@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -46,8 +46,6 @@ Source1: bash-completion-rpmlintrc
Patch0: %{_name}-2.4.patch
# PATCH-FIX-SUSE bnc#1012212 -- bash tab-autocompletion hangs on TAR-archiving with --create key
Patch1: tar-completion.patch
# PATCH-FIX-SUSE bnc#903362 -- tab completion for file names prints error
Patch2: PS1-completion-boo903362.patch
# PATCH-FIX-SUSE boo#905348 -- tab completion with shell variable changes command line with backslash
Patch3: FOO-dir-completion-boo905348.patch
# PATCH-FIX-SUSE
@ -78,7 +76,7 @@ BuildRequires: asciidoc
BuildRequires: libxslt-tools
%endif
%if %{build_core}
Requires: bash
Requires: bash >= 5.1.16
%endif
%description