- updated to 2.11

- updated ip_addresses,no_mtr patches
- separated -devel not to require all completions for development
- changed Requires(triggerpostun) to Requires(post) for rpm.org

diff --git a/bash-completion-ip_addresses.patch b/bash-completion-ip_addresses.patch
index 334710095102c2a9b4df9f0b5b29856677b0c3f4..41c7ec81e7917ee84e93365a1952fe9388d4f9dc 100644 (file)
--- a/bash-completion-ip_addresses.patch
+++ b/bash-completion-ip_addresses.patch
@@ -1,14 +1,18 @@
-diff -ruNp bash-completion-2.8.orig/bash_completion bash-completion-2.8/bash_completion
---- bash-completion-2.8.orig/bash_completion   2018-03-17 09:25:59.000000000 +0100
-+++ bash-completion-2.8/bash_completion        2018-06-24 00:00:18.077840392 +0200
-@@ -919,9 +919,7 @@ _ip_addresses()
- {
+--- bash-completion-2.11/bash_completion.orig  2021-03-06 22:21:09.007031994 +0100
++++ bash-completion-2.11/bash_completion       2021-03-06 22:24:28.382618551 +0100
+@@ -981,11 +981,10 @@ _ip_addresses()
+         *) n= ;;
+     esac
      local PATH=$PATH:/sbin
-     COMPREPLY+=( $( compgen -W \
--        "$( { LC_ALL=C ifconfig -a || ip addr show; } 2>/dev/null | command sed -ne \
--            's/.*addr:\([^[:space:]]*\).*/\1/p' -ne \
--            's|.*inet[[:space:]]\{1,\}\([^[:space:]/]*\).*|\1|p' )" \
-+        "$( ip -o addr show 2>/dev/null | command awk '{ gsub(/\/.*$/, "", $4); print $4 }' | sort )" \
-         -- "$cur" ) )
+-    local addrs=$({
+-        LC_ALL=C ifconfig -a || ip addr show
+-    } 2>/dev/null |
+-        command sed -e 's/[[:space:]]addr:/ /' -ne \
+-            "s|.*inet${n}[[:space:]]\{1,\}\([^[:space:]/]*\).*|\1|p")
++    local addrs=$(
++        LC_ALL=C ip -o addr show
++    2>/dev/null |
++      command awk '{ gsub(/\/.*$/, "", $4); print $4 }' | sort)
+     COMPREPLY+=($(compgen -W "$addrs" -- "${cur-}"))
  }
  

diff --git a/bash-completion-no_mtr.patch b/bash-completion-no_mtr.patch
index e23451b3cfd7fce0c60de009d235d8bc09236aaf..174a16ae55cedb83d1acea514e785ef9e827d50b 100644 (file)
--- a/bash-completion-no_mtr.patch
+++ b/bash-completion-no_mtr.patch
@@ -1,10 +1,9 @@
-diff -ruNp bash-completion-2.8.orig/bash_completion bash-completion-2.8/bash_completion
---- bash-completion-2.8.orig/bash_completion   2018-03-17 09:25:59.000000000 +0100
-+++ bash-completion-2.8/bash_completion        2018-06-24 00:45:30.480896640 +0200
-@@ -1659,7 +1659,7 @@ _known_hosts_real()
+--- bash-completion-2.11/bash_completion.orig  2021-03-06 22:24:43.862534689 +0100
++++ bash-completion-2.11/bash_completion       2021-03-07 06:44:50.513308049 +0100
+@@ -1801,7 +1801,7 @@ _known_hosts_real()
  
  } # _known_hosts_real()
- complete -F _known_hosts traceroute traceroute6 tracepath tracepath6 \
+ complete -F _known_hosts traceroute traceroute6 \
 -    fping fping6 telnet rsh rlogin ftp dig mtr ssh-installkeys showmount
 +    fping fping6 telnet rsh rlogin ftp dig ssh-installkeys showmount
  

diff --git a/bash-completion.spec b/bash-completion.spec
index e8d124260e958939e50496997e817aa84a3dd7e4..9a1854ff5a9fed6944361e0a8f1a04ceacec03db 100644 (file)
--- 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:       2
+Version:       2.11
+Release:       1
 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
@@ -24,7 +25,7 @@ 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:      pld-release
 Obsoletes:     bash-completion-rpm-cache
@@ -41,6 +42,19 @@ 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
@@ -72,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
@@ -105,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