Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

11 changed files with 116 additions and 120 deletions

View File

@ -1 +0,0 @@
2260342127086cfedd4801f796fdaaa051411a14 SOURCES/bash-completion-2.7.tar.xz

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/bash-completion-2.7.tar.xz
/*.tar.*

View File

@ -1,12 +0,0 @@
diff -up bash-completion-1.99/bash_completion~ bash-completion-1.99/bash_completion
--- bash-completion-1.99/bash_completion~ 2012-01-08 01:03:46.000000000 +0200
+++ bash-completion-1.99/bash_completion 2012-01-08 13:50:33.412012530 +0200
@@ -45,7 +45,7 @@ readonly BASH_COMPLETION_COMPAT_DIR
# Blacklisted completions, causing problems with our code.
#
-_blacklist_glob='@(acroread.sh)'
+_blacklist_glob='@()'
# Turn on extended globbing and programmable completion
shopt -s extglob progcomp

View File

@ -1,35 +0,0 @@
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -121,6 +121,31 @@ A. No. Use `M-/` to (in the words of the bash man page) attempt file
A. Put them in `~/.bash_completion`, which is parsed at the end of the
main completion script. See also the next question.
+**Q. How can I override a completion shipped by bash-completion?**
+
+A. Install a local completion of your own appropriately for the desired
+ command, and it will take precedence over the one shipped by us. See the
+ next answer for details where to install it, if you are doing it on per
+ user basis. If you want to do it system wide, you can install eagerly
+ loaded files in `compatdir` (see a couple of questions further down for
+ more info) and install a completion for the commands to override
+ completions shipped by us.
+
+ If you want to use bash's default completion instead of one of ours,
+ something like this should work (where `$cmd` is the command to override
+ completion for): `complete -o default -o bashdefault $cmd`
+
+**Q. Where should I install my own local completions?**
+
+A. Put them in the `completions` subdir of `$BASH_COMPLETION_USER_DIR`
+ (defaults to `$XDG_DATA_HOME/bash-completion` or
+ `~/.local/share/bash-completion`
+ if `$XDG_DATA_HOME` is not set) to have them loaded on demand.
+ See also the next question's answer for considerations for these
+ files' names, they apply here as well. Alternatively, you can write
+ them directly in `~/.bash_completion` which is loaded eagerly by
+ our main script.
+
**Q. I author/maintain package X and would like to maintain my own
completion code for this package. Where should I put it to be sure
that interactive bash shells will find it and source it?**

View File

@ -1,14 +0,0 @@
diff --git a/completions/man b/completions/man
--- a/completions/man
+++ b/completions/man
@@ -53,9 +53,7 @@ _man()
return
fi
- local manpath="$MANPATH"
- [[ -z $manpath ]] && \
- manpath=$( manpath 2>/dev/null || command man -w 2>/dev/null )
+ local manpath=$( manpath 2>/dev/null || command man -w 2>/dev/null )
[[ -z $manpath ]] && manpath="/usr/share/man:/usr/local/share/man"
# determine manual section to search

View File

@ -1,27 +0,0 @@
diff --git a/completions/Makefile.am b/completions/Makefile.am
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -315,7 +315,7 @@ bashcomp_DATA = 2to3 \
reportbug \
_reptyr \
resolvconf \
- rfkill \
+ _rfkill \
ri \
rmlist \
rmmod \
diff --git a/completions/rfkill b/completions/_rfkill
similarity index 86%
rename from completions/rfkill
rename to completions/_rfkill
--- a/completions/rfkill
+++ b/completions/_rfkill
@@ -1,5 +1,8 @@
# bash completion for rfkill -*- shell-script -*-
+# Use of this file is deprecated on systems with util-linux >= 2.31, which
+# ships completion for the rfkill included with it.
+
_rfkill()
{
local cur prev words cword

View File

@ -4,21 +4,14 @@
%global _python_bytecompile_errors_terminate_build 0
Name: bash-completion
Version: 2.7
Release: 5%{?dist}
Version: 2.11
Release: 16%{?dist}
Epoch: 1
Summary: Programmable completion for Bash
License: GPLv2+
License: GPL-2.0-or-later
URL: https://github.com/scop/bash-completion
Source0: https://github.com/scop/bash-completion/releases/download/%{version}/%{name}-%{version}.tar.xz
# https://bugzilla.redhat.com/677446, see also redefine_filedir comments
Patch0: %{name}-1.99-noblacklist.patch
# It should be removed while rebasing to bash-completion-2.8
Patch1: %{name}-rfkill.patch
# It should be removed while rebasing to bash-completion-2.8
Patch2: %{name}-manpath.patch
Patch3: %{name}-2.9-override-completions.patch
BuildArch: noarch
%if %{with tests}
@ -29,6 +22,7 @@ BuildRequires: tcllib
# Needed for rfkill patch as it modifies Makefile.am
# It should be removed while rebasing to bash-completion-2.8
BuildRequires: automake
BuildRequires: make
Requires: bash >= 4.1
%description
@ -45,31 +39,24 @@ autoreconf -fi -v
%configure
%make_build
cat <<EOF >redefine_filedir
# This is a copy of the _filedir function in bash_completion, included
# and (re)defined separately here because some versions of Adobe
# Reader, if installed, are known to override this function with an
# incompatible version, causing various problems.
#
# https://bugzilla.redhat.com/677446
# http://forums.adobe.com/thread/745833
EOF
sed -ne '/^_filedir\s*(/,/^}/p' bash_completion >>redefine_filedir
%install
%make_install
install -Dpm 644 redefine_filedir \
%{buildroot}%{_sysconfdir}/bash_completion.d/redefine_filedir
# Updated completion shipped in cowsay package:
rm %{buildroot}%{_datadir}/bash-completion/completions/{cowsay,cowthink}
# Bug 1819867 - conflict over the makepkg name with pacman
rm %{buildroot}%{_datadir}/bash-completion/completions/makepkg
# Bug 2088307 - Remove completions for prelink
rm %{buildroot}%{_datadir}/bash-completion/completions/prelink
# Bug 2188865 - Remove bash completions for javaws as it's not shipped with Fedora
rm %{buildroot}%{_datadir}/bash-completion/completions/javaws
%check
# For some tests involving non-ASCII filenames
export LANG=en_US.UTF-8
export LANG=C.UTF-8
%if %{with tests}
# This stuff borrowed from dejagnu-1.4.4-17 (tests need a terminal)
tmpfile=$(mktemp)
@ -88,16 +75,95 @@ make -C completions check
%doc AUTHORS CHANGES CONTRIBUTING.md README.md
%doc doc/bash_completion.txt
%config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
%{_sysconfdir}/bash_completion.d/
%{_datadir}/bash-completion/
%{_datadir}/cmake/
%{_datadir}/pkgconfig/bash-completion.pc
%changelog
* Mon Aug 13 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.7-5
- Document how to override default completions
Resolves: #1575573
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:2.11-16
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:2.11-15
- Bump release for June 2024 mass rebuild
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jun 16 2023 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.11-11
- Remove bash completions for javaws
Resolves: #2188865
* Tue Apr 11 2023 Lukáš Zaoral <lzaoral@redhat.com> - 1:2.11-10
- migrate to SPDX license format
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu May 19 2022 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.11-7
- Remove completions for prelink
Resolves: #2088307
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Dec 21 2021 Ville Skyttä <ville.skytta@iki.fi> - 1:2.11-5
- Revert back to upstream _filedir override avoidance
* Mon Nov 08 2021 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.11-4
- Avoid conflict with makepkg completions in pacman
Resolves: #1819867
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 8 13:20:44 CET 2021 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.11-1
- Rebase to version 2.11
Resolves: #1782254
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jan 10 2019 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.8-5
- Add completion for rpm -q --licensefiles
Resolves: #1578811
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:2.8-4
- Use C.UTF-8 locale
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
* Mon Aug 13 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.8-3
- Document how to turn off default completions
Resolves: #1575571
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 12 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.8-1
- Update to 2.8
Resolves: #1561241
* Wed Mar 14 2018 Siteshwar Vashisht <svashisht@redhat.com> - 1:2.7-4
- Do not use $MANPATH directly

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

11
plans/bash-completion.fmf Normal file
View File

@ -0,0 +1,11 @@
summary: Run internal bash-completion tests
discover:
- name: Internal bash-completion gating tests
how: fmf
url: git://pkgs.devel.redhat.com/tests/bash-completion
filter: 'component: bash-completion'
execute:
how: tmt
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (bash-completion-2.11.tar.xz) = 41585f730b5114d397831ba36d10d05643c6a6179e746ddc49aa1cbef61ea5525fd2f09b2e474adee14e647f99df8d5983ee48e29a59d8a30e1daf7fb1837e06