Accepting request 1306737 from shells

- "interdiff" shipped as part of patchutils since version 0.4.3,
  so drop it here (forwarded request 1306736 from sndirsch)

OBS-URL: https://build.opensuse.org/request/show/1306737
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash-completion?expand=0&rev=63

bash-completion.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Sep 23 11:42:26 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- "interdiff" shipped as part of patchutils since version 0.4.3,
+  so drop it here
+
+-------------------------------------------------------------------
+Thu Sep 18 13:02:46 UTC 2025 - Dr. Werner Fink <werner@suse.de>
+
+- Add patch bug1246923.patch
+  * Skip colon from device names for ethtool (bsc#1246923) 
+
+-------------------------------------------------------------------
+Mon Feb 24 13:44:59 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Drop completions for kmod; kmod>=34 provides its own now.
+
+-------------------------------------------------------------------
+Mon Jan 20 13:30:07 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- No longer ship completion for secret-tool, which belongs to
+  libsecret and newly brings the completions by itself.
+  https://github.com/scop/bash-completion/issues/1317
+
 -------------------------------------------------------------------
 Fri Mar 22 13:31:54 UTC 2024 - Dr. Werner Fink <werner@suse.de>
 

bash-completion.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package bash-completion
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -70,6 +70,8 @@ Patch13:        boo1190929-9af4afd0.patch
 Patch14:        bsc1199724-modules.patch
 # PATCH-FIX-SUSE boo#1221414 -- shells/bash-completion: Bug
 Patch15:        boo1221414-scp.patch
+# PATCH-FIX-UPSTREAM bsc#1246923 --  [SLES 16.0] The network name is end with ":" via ethtool auto-completion
+Patch16:        bug1246923.patch
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildArch:      noarch
@@ -120,28 +122,25 @@ popd
 %install
 %if %{build_core}
 %make_install
+del=""
 # shipping in latest systemd now
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/udevadm
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/nmcli
+del="$del nmcli udevadm"
 # shipping in latest util-linux now
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/cal
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/chsh
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/dmesg
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/eject
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/hexdump
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/hwclock
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/ionice
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/look
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/mount
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/newgrp
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/renice
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/rtcwake
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/su
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/umount
+del="$del cal chsh dmesg eject hexdump hwclock ionice look mount newgrp renice rtcwake su umount"
 # shipping in devscripts now
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/bts
+del="$del bts"
+# shipped as part of libsecret
+del="$del secret-tool"
 # Seems to be broken (boo#1161136)
-rm -vf %{buildroot}%{_datadir}/bash-completion/completions/_adb
+del="$del _adb"
+# shipped as part of kmod
+del="$del insmod insmod.static modinfo modprobe rmmod"
+# shipped as part of patchutils
+del="$del interdiff"
+
+for i in $del; do
+	rm -fv "%{buildroot}%{_datadir}/bash-completion/completions/$i"
+done
 %endif
 %if %{build_doc}
 pushd doc

bug1246923.patch

@@ -0,0 +1,24 @@
+From a452aee8fb58720ecfadbdaad95277ac9d9072ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Thu, 2 May 2024 21:22:09 +0300
+Subject: [PATCH] fix(available_interfaces): strip only trailing colon from
+ entries
+
+Leave other punctuation alone, at least for now.
+
+Closes https://github.com/scop/bash-completion/issues/1133
+---
+ bash_completion |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/bash_completion
++++ b/bash_completion	2025-09-18 13:01:19.130576676 +0000
+@@ -1738,7 +1738,7 @@ _comp_compgen_available_interfaces()
+         fi
+     } 2>/dev/null | _comp_awk \
+         '/^[^ \t]/ { if ($1 ~ /^[0-9]+:/) { print $2 } else { print $1 } }')" &&
+-        _comp_compgen -U generated set "${generated[@]}"
++        _comp_compgen -U generated set "${generated[@]%:}"
+ }
+ 
+ # Echo number of CPUs, falling back to 1 on failure.