From a87b3e77d26534fe4141f016694c5517d639617f5746cf83c0ddc92e4cc21840 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 18 Mar 2015 13:49:08 +0000
Subject: [PATCH 1/2] .

OBS-URL: https://build.opensuse.org/package/show/shells/bash-completion?expand=0&rev=54
---
 FOO-dir-completion-boo905348.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FOO-dir-completion-boo905348.patch b/FOO-dir-completion-boo905348.patch
index f9ff740..ccdb1c2 100644
--- a/FOO-dir-completion-boo905348.patch
+++ b/FOO-dir-completion-boo905348.patch
@@ -29,7 +29,7 @@
  
 +# Perform dollar ($) completion
 +# @return  True (0) if completion needs further processing,
-+#          False (> 0) if tilde is followed by a valid username, completions
++#          False (> 0) if dollar is followed by a valid username, completions
 +#          are put in COMPREPLY and no further processing is necessary.
 +_dollar()
 +{

From 808517c9f04385b62570afa014f88509f95f138a2a10f799228d1221ca0ba717 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 15 Jun 2015 08:39:30 +0000
Subject: [PATCH 2/2] .

OBS-URL: https://build.opensuse.org/package/show/shells/bash-completion?expand=0&rev=56
---
 bash-completion.changes       |  6 ++++++
 bash-completion.spec          |  3 +++
 ls-completion-boo889319.patch | 29 +++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 ls-completion-boo889319.patch

diff --git a/bash-completion.changes b/bash-completion.changes
index f8c7680..c5b53b4 100644
--- a/bash-completion.changes
+++ b/bash-completion.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 15 08:28:30 UTC 2015 - werner@suse.de
+
+- Add patch ls-completion-boo889319.patch to make ls completion
+  more smart (boo#889319) 
+
 -------------------------------------------------------------------
 Wed Mar 18 12:45:23 UTC 2015 - werner@suse.de
 
diff --git a/bash-completion.spec b/bash-completion.spec
index dda3967..df98bed 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -35,6 +35,8 @@ Patch2:         PS1-completion-boo903362.patch
 Patch3:         FOO-dir-completion-boo905348.patch
 # PATCH-FIX-SUSE boo#922758 -- avoid negative cword position counter
 Patch4:         init-completion-boo922758.patch
+# PATCH-FIX-SUSE boo#889319
+Patch5:         ls-completion-boo889319.patch
 BuildRequires:  pkg-config
 Requires:       bash
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -51,6 +53,7 @@ of the programmable completion feature of Bash 2.04 and later.
 %patch2 -b .p2
 %patch3 -b .p3
 %patch4 -b .p4
+%patch5 -b .p5
 
 %build
 %configure
diff --git a/ls-completion-boo889319.patch b/ls-completion-boo889319.patch
new file mode 100644
index 0000000..282c2bb
--- /dev/null
+++ b/ls-completion-boo889319.patch
@@ -0,0 +1,29 @@
+---
+ bash_completion |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+--- bash_completion
++++ bash_completion	2015-06-15 08:24:25.093518526 +0000
+@@ -1838,14 +1838,20 @@ _longopt()
+     fi
+ }
+ # makeinfo and texi2dvi are defined elsewhere.
+-complete -F _longopt -o filenames a2ps awk base64 bash bc bison cat colordiff cp csplit \
++complete -F _longopt filenames a2ps awk base64 bash bc bison cat colordiff cp csplit \
+     cut date df diff dir du enscript expand fmt fold gperf \
+-    grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
++    grep grub head indent irb ld ldd less ln m4 md5sum mkdir mkfifo mknod \
+     mv nl nm objcopy objdump od paste pr ptx readelf rm rmdir \
+     sed sha{,1,224,256,384,512}sum shar sort split strip sum tac tail tee \
+     texindex touch tr unexpand uniq vdir wc who
+ complete -F _longopt -o default env netstat seq uname units
+ 
++if typeset -F _ls_ &> /dev/null; then
++    complete -o bashdefault -o default -o filenames -o nospace -F _ls_ ls ll la l ls-l lf
++else
++    complete -o bashdefault -o default -o filenames -o nospace -F _longopt ls ll la l ls-l lf
++fi
++
+ declare -A _xspecs
+ _filedir_xspec()
+ {