From: Marcin Krol Date: Sun, 27 Feb 2022 00:26:41 +0000 (+0100) Subject: - merged 2.11 from PLD X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=01dca3f38b9a9be927cb21c6529209c995a30870;p=packages%2Fbash-completion.git - merged 2.11 from PLD --- diff --git a/bash-completion-rpm-cache.patch b/bash-completion-rpm-cache.patch index 9c9d401..965b938 100644 --- a/bash-completion-rpm-cache.patch +++ b/bash-completion-rpm-cache.patch @@ -1,22 +1,24 @@ -Support rpm (jbj rpm 4.4.7+) hrmib exports for rpm -qa filter (via %_hrmib_path /var/cache/hrmib) - -Not accepted upstream. - --- -Signed-off-by: Elan Ruusamäe - ---- bash-completion-2.0/completions/rpm.orig 2012-01-07 23:44:41.000000000 +0100 -+++ bash-completion-2.0/completions/rpm 2012-07-28 07:21:12.033708931 +0200 -@@ -4,6 +4,12 @@ - +--- bash-completion-2.11/completions/rpm.orig 2020-07-25 13:49:49.000000000 +0200 ++++ bash-completion-2.11/completions/rpm 2021-11-17 00:01:41.257388895 +0100 +@@ -5,17 +5,16 @@ _rpm_installed_packages() { -+ # if rpm (4.4.7+) is configured to export it's rpmdb to /var/cache/hrmib (%_hrmib_path) -+ if [ -d /var/cache/hrmib -a -r /var/cache/hrmib ]; then -+ COMPREPLY=( $( LC_ALL=C command ls -1 /var/cache/hrmib | sed -ne '/^'$cur'/p') ) -+ return -+ fi -+ if [[ -r /var/log/rpmpkgs && \ - /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]]; then - # using RHL 7.2 or later - this is quicker than querying the DB +- /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]]; then +- # using RHL 7.2 or later - this is quicker than querying the DB +- COMPREPLY=($(compgen -W "$(command sed -ne \ +- 's|^\([^[:space:]]\{1,\}\)-[^[:space:]-]\{1,\}-[^[:space:]-]\{1,\}\.rpm$|\1|p' \ ++ /var/log/rpmpkgs -nt /var/lib/rpm/rpmdb.sqlite ]]; then ++ # simple list generated by 'rpm -qa' command ++ COMPREPLY=($(compgen -W "$(command cat -ne \ + /var/log/rpmpkgs)" -- "$cur")) + elif type rpmqpack &>/dev/null; then + # SUSE's rpmqpack is faster than rpm -qa + COMPREPLY=($(compgen -W '$(rpmqpack)' -- "$cur")) + else + COMPREPLY=($(${1:-rpm} -qa --nodigest --nosignature \ +- --queryformat='%{NAME} ' "$cur*" 2>/dev/null)) ++ --queryformat='%{NAME}-%{VERSION}-%{RELEASE}\n' 2>/dev/null | while read x ; do [[ "$x" == "$cur"* ]] && echo $x ; done)) + fi + } + diff --git a/bash-completion.spec b/bash-completion.spec index 6f9ad9a..536974a 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -5,13 +5,14 @@ Summary: bash-completion offers programmable completion for bash Summary(pl.UTF-8): Programowalne uzupełnianie nazw dla basha Name: bash-completion -Version: 2.8 -Release: 1 +Version: 2.11 +Release: 2 Epoch: 1 License: GPL v2+ Group: Applications/Shells +#Source0Download: https://github.com/scop/bash-completion/releases Source0: https://github.com/scop/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz -# Source0-md5: 201b6ae62f7d5fb5b1b25e34427db919 +# Source0-md5: 2514c6772d0de6254758b98c53f91861 Source1: %{name}-poldek.sh # https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/106975 Source3: http://launchpadlibrarian.net/19164189/mysqldump @@ -20,9 +21,11 @@ Source4: http://svn.php.net/viewvc/pear2/sandbox/PEAR_BashCompletion/trunk/pear? # Source4-md5: 8ce77e4459e2c45e2096da8d03c8f43d Patch0: %{name}-rpm-cache.patch Patch1: pear.patch +Patch2: %{name}-ip_addresses.patch +Patch3: %{name}-no_mtr.patch URL: https://github.com/scop/bash-completion BuildRequires: sed >= 4.0 -Requires(triggerpostun): sed >= 4.0 +Requires(post): sed >= 4.0 Requires: bash >= 4.1 Requires: issue >= 2013.01 Obsoletes: bash-completion-rpm-cache @@ -39,11 +42,26 @@ bash-completion jest kolekcją funkcji shella, które opierają się na wbudowanych rozszerzeniach basha 4.1 lub późniejszego umożliwiającego dopełnianie parametrów linii poleceń. +%package devel +Summary: Development files for bash-completion +Summary(pl.UTF-8): Pliki programistyczne do pakietu bash-completion +Group: Development/Tools +# doesn't require base: it just contain paths configuration +Conflicts: bash-completion < 1:2.11 + +%description devel +pkg-config and cmake files for bash-completion packages development. + +%description devel -l pl.UTF-8 +Pliki pkg-configa i cmake'a do tworzenia pakietów bash-completion. + %prep %setup -q cp -p '%{SOURCE4}' completions/pear %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # cleanup backups after patching find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f @@ -68,8 +86,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/poldek cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/mysqldump cp -p completions/pear $RPM_BUILD_ROOT%{_datadir}/%{name}/completions -# util-linux -%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/{mount,umount} # No package matches '*/apache2ctl' %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/apache2ctl # No PLD package or no such binary to complete on @@ -78,7 +94,7 @@ cp -p completions/pear $RPM_BUILD_ROOT%{_datadir}/%{name}/completions # FreeBSD stuff %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/{kldload,portupgrade} # Debian stuff -%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/{apt-build,dselect,reportbug,alternatives,update-alternatives,lintian,lintian-info} +%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/{apt-build,bts,dselect,reportbug,alternatives,update-alternatives,lintian,lintian-info} # do not generate autodeps chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}/helpers/perl @@ -101,4 +117,8 @@ sed -i -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc %dir %{_datadir}/%{name}/helpers %attr(755,root,root) %{_datadir}/%{name}/helpers/perl %attr(755,root,root) %{_datadir}/%{name}/helpers/python + +%files devel +%defattr(644,root,root,755) %{_npkgconfigdir}/bash-completion.pc +%{_datadir}/cmake/bash-completion diff --git a/builder.bash-completion b/builder.bash-completion index 623683f..0b081c8 100644 --- a/builder.bash-completion +++ b/builder.bash-completion @@ -1,4 +1,4 @@ -# TLD Linux builder(1) script completion +# PLD Linux builder(1) script completion # get active spec file from commandline # caller should make $spec local variable