diff --git a/bash-completion.spec b/bash-completion.spec index 17e23b4052d81e6df48280ca99721ed408022afc..aea7cf79d7bb0d7640a5d51933376ab4fc19c3d6 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -3,7 +3,7 @@ Name: bash-completion Version: 2.16.0 -Release: 3 +Release: 4 Epoch: 1 Summary: Completion for bash command License: GPL-2.0-or-later @@ -11,6 +11,7 @@ URL: https://github.com/scop/bash-completion Source0: https://github.com/scop/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Patch0: bash-completion-2.16.0-remove-python2.patch +Patch1: remove-interdiff-completion.patch Patch6001: backport-refactor-secret-tool-deprecate-ours-in-favor-of-upstream.patch Patch6002: backport-fix-feh-fix-nounset-error.patch Patch6003: backport-fix-_umount-feh-sbopkg-check-diretory-name-for-_comp.patch @@ -68,7 +69,10 @@ make -C completions check %doc CHANGELOG.md README.md doc/configuration.md CONTRIBUTING.md %changelog -*Tue May 27 2025 Linux_zhang - 1:2.16.0-3 +* Wed Sep 10 2025 Funda Wang - 1:2.16.0-4 +- Remove interdiff completion because it conflicts with patchutils >= 0.4.3 + +* Tue May 27 2025 Linux_zhang - 1:2.16.0-3 - DESC:check diretory name for _comp_compgen -C * Tue Jan 28 2025 Funda Wang - 1:2.16.0-2 diff --git a/remove-interdiff-completion.patch b/remove-interdiff-completion.patch new file mode 100644 index 0000000000000000000000000000000000000000..2becb1a75232b8634da8bbeee60701800029cbf7 --- /dev/null +++ b/remove-interdiff-completion.patch @@ -0,0 +1,24 @@ +diff --git a/completions/Makefile.am b/completions/Makefile.am +index 4a76cd8..0ebc73e 100644 +--- a/completions/Makefile.am ++++ b/completions/Makefile.am +@@ -186,7 +186,6 @@ cross_platform = 2to3 \ + inotifywait \ + _insmod \ + installpkg \ +- interdiff \ + invoke-rc.d \ + _ionice \ + ip \ +diff --git a/test/t/Makefile.am b/test/t/Makefile.am +index 8205e15..02f47ad 100644 +--- a/test/t/Makefile.am ++++ b/test/t/Makefile.am +@@ -259,7 +259,6 @@ EXTRA_DIST = \ + test_inotifywatch.py \ + test_insmod.py \ + test_installpkg.py \ +- test_interdiff.py \ + test_invoke_rc_d.py \ + test_ionice.py \ + test_ip.py \