From 653669ba6d075080f20fed19c8237b1040ed1b1b Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Apr 08 2013 18:57:23 +0000 Subject: Update to 2.1 (fixes #860510, #906469, #912113, #919246, #928253). - Don't ship completions included in util-linux 2.23-rc2 for F-19+. --- diff --git a/bash-completion-2.1-util-linux-223.patch b/bash-completion-2.1-util-linux-223.patch new file mode 100644 index 0000000..d6b922e --- /dev/null +++ b/bash-completion-2.1-util-linux-223.patch @@ -0,0 +1,264 @@ +diff -up bash-completion-2.1/bash_completion~ bash-completion-2.1/bash_completion +--- bash-completion-2.1/bash_completion~ 2013-04-05 13:55:51.000000000 +0300 ++++ bash-completion-2.1/bash_completion 2013-04-06 11:43:56.292170674 +0300 +@@ -59,7 +59,7 @@ complete -d pushd + # start of section containing compspecs that can be handled within bash + + # user commands see only users +-complete -u write chfn groups slay w sux runuser ++complete -u groups slay w sux + + # bg completes with stopped jobs + complete -A stopped -P '"%' -S '"' bg +diff -up bash-completion-2.1/completions/Makefile.am~ bash-completion-2.1/completions/Makefile.am +--- bash-completion-2.1/completions/Makefile.am~ 2013-04-05 13:55:51.000000000 +0300 ++++ bash-completion-2.1/completions/Makefile.am 2013-04-06 11:49:59.955323723 +0300 +@@ -27,7 +27,6 @@ bashcomp_DATA = a2x \ + brctl \ + btdownloadheadless.py \ + bzip2 \ +- cal \ + cancel \ + cardctl \ + ccache \ +@@ -43,7 +42,6 @@ bashcomp_DATA = a2x \ + chpasswd \ + chronyc \ + chrpath \ +- chsh \ + cksfv \ + cleanarch \ + clisp \ +@@ -65,7 +63,6 @@ bashcomp_DATA = a2x \ + desktop-file-validate \ + dhclient \ + dict \ +- dmesg \ + dnsspoof \ + dot \ + dpkg \ +@@ -76,7 +73,6 @@ bashcomp_DATA = a2x \ + dumpe2fs \ + e2freefrag \ + e2label \ +- eject \ + eog \ + ether-wake \ + evince \ +@@ -120,12 +116,10 @@ bashcomp_DATA = a2x \ + gzip \ + hcitool \ + hddtemp \ +- hexdump \ + hid2hci \ + hping2 \ + htop \ + htpasswd \ +- hwclock \ + iconv \ + id \ + idn \ +@@ -137,7 +131,6 @@ bashcomp_DATA = a2x \ + installpkg \ + interdiff \ + invoke-rc.d \ +- ionice \ + ip \ + iperf \ + ipmitool \ +@@ -177,7 +170,6 @@ bashcomp_DATA = a2x \ + list_lists \ + list_members \ + list_owners \ +- look \ + lpq \ + lpr \ + lrzip \ +@@ -225,7 +217,6 @@ bashcomp_DATA = a2x \ + nc \ + ncftp \ + nethogs \ +- newgrp \ + newlist \ + newusers \ + ngrep \ +@@ -283,7 +274,6 @@ bashcomp_DATA = a2x \ + rdesktop \ + remove_members \ + removepkg \ +- renice \ + reportbug \ + reptyr \ + resolvconf \ +@@ -298,7 +288,6 @@ bashcomp_DATA = a2x \ + rpmcheck \ + rrdtool \ + rsync \ +- rtcwake \ + sbcl \ + sbopkg \ + screen \ +@@ -320,7 +309,6 @@ bashcomp_DATA = a2x \ + sshow \ + strace \ + strings \ +- su \ + sudo \ + svcadm \ + svk \ +@@ -478,7 +466,6 @@ CLEANFILES = \ + mplayer2 \ + msgsnarf \ + muttng \ +- ncal \ + pbzip2 \ + pccardctl \ + pdlzip \ +@@ -603,10 +590,6 @@ symlinks: $(targetdir) $(DATA) + rm -f $(targetdir)/$$file && \ + $(LN_S) bzip2 $(targetdir)/$$file ; \ + done +- for file in ncal ; do \ +- rm -f $(targetdir)/$$file && \ +- $(LN_S) cal $(targetdir)/$$file ; \ +- done + for file in pccardctl ; do \ + rm -f $(targetdir)/$$file && \ + $(LN_S) cardctl $(targetdir)/$$file ; \ +@@ -669,10 +652,6 @@ symlinks: $(targetdir) $(DATA) + rm -f $(targetdir)/$$file && \ + $(LN_S) hcitool $(targetdir)/$$file ; \ + done +- for file in hd ; do \ +- rm -f $(targetdir)/$$file && \ +- $(LN_S) hexdump $(targetdir)/$$file ; \ +- done + for file in hping hping3 ; do \ + rm -f $(targetdir)/$$file && \ + $(LN_S) hping2 $(targetdir)/$$file ; \ +diff -up bash-completion-2.1/completions/Makefile.in~ bash-completion-2.1/completions/Makefile.in +--- bash-completion-2.1/completions/Makefile.in~ 2013-04-05 13:56:55.000000000 +0300 ++++ bash-completion-2.1/completions/Makefile.in 2013-04-06 11:51:40.564047943 +0300 +@@ -198,7 +198,6 @@ bashcomp_DATA = a2x \ + brctl \ + btdownloadheadless.py \ + bzip2 \ +- cal \ + cancel \ + cardctl \ + ccache \ +@@ -214,7 +213,6 @@ bashcomp_DATA = a2x \ + chpasswd \ + chronyc \ + chrpath \ +- chsh \ + cksfv \ + cleanarch \ + clisp \ +@@ -236,7 +234,6 @@ bashcomp_DATA = a2x \ + desktop-file-validate \ + dhclient \ + dict \ +- dmesg \ + dnsspoof \ + dot \ + dpkg \ +@@ -247,7 +244,6 @@ bashcomp_DATA = a2x \ + dumpe2fs \ + e2freefrag \ + e2label \ +- eject \ + eog \ + ether-wake \ + evince \ +@@ -291,12 +287,10 @@ bashcomp_DATA = a2x \ + gzip \ + hcitool \ + hddtemp \ +- hexdump \ + hid2hci \ + hping2 \ + htop \ + htpasswd \ +- hwclock \ + iconv \ + id \ + idn \ +@@ -308,7 +302,6 @@ bashcomp_DATA = a2x \ + installpkg \ + interdiff \ + invoke-rc.d \ +- ionice \ + ip \ + iperf \ + ipmitool \ +@@ -348,7 +341,6 @@ bashcomp_DATA = a2x \ + list_lists \ + list_members \ + list_owners \ +- look \ + lpq \ + lpr \ + lrzip \ +@@ -396,7 +388,6 @@ bashcomp_DATA = a2x \ + nc \ + ncftp \ + nethogs \ +- newgrp \ + newlist \ + newusers \ + ngrep \ +@@ -454,7 +445,6 @@ bashcomp_DATA = a2x \ + rdesktop \ + remove_members \ + removepkg \ +- renice \ + reportbug \ + reptyr \ + resolvconf \ +@@ -469,7 +459,6 @@ bashcomp_DATA = a2x \ + rpmcheck \ + rrdtool \ + rsync \ +- rtcwake \ + sbcl \ + sbopkg \ + screen \ +@@ -491,7 +480,6 @@ bashcomp_DATA = a2x \ + sshow \ + strace \ + strings \ +- su \ + sudo \ + svcadm \ + svk \ +@@ -649,7 +637,6 @@ CLEANFILES = \ + mplayer2 \ + msgsnarf \ + muttng \ +- ncal \ + pbzip2 \ + pccardctl \ + pdlzip \ +@@ -984,10 +971,6 @@ symlinks: $(targetdir) $(DATA) + rm -f $(targetdir)/$$file && \ + $(LN_S) bzip2 $(targetdir)/$$file ; \ + done +- for file in ncal ; do \ +- rm -f $(targetdir)/$$file && \ +- $(LN_S) cal $(targetdir)/$$file ; \ +- done + for file in pccardctl ; do \ + rm -f $(targetdir)/$$file && \ + $(LN_S) cardctl $(targetdir)/$$file ; \ +@@ -1050,10 +1033,6 @@ symlinks: $(targetdir) $(DATA) + rm -f $(targetdir)/$$file && \ + $(LN_S) hcitool $(targetdir)/$$file ; \ + done +- for file in hd ; do \ +- rm -f $(targetdir)/$$file && \ +- $(LN_S) hexdump $(targetdir)/$$file ; \ +- done + for file in hping hping3 ; do \ + rm -f $(targetdir)/$$file && \ + $(LN_S) hping2 $(targetdir)/$$file ; \ diff --git a/bash-completion.spec b/bash-completion.spec index 0ab1d78..2d458ca 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -4,8 +4,8 @@ %global _python_bytecompile_errors_terminate_build 0 Name: bash-completion -Version: 2.0 -Release: 3%{?dist} +Version: 2.1 +Release: 1%{?dist} Epoch: 1 Summary: Programmable completion for Bash @@ -17,6 +17,8 @@ Source2: CHANGES.package.old Source3: %{name}-2.0-redefine_filedir.bash # https://bugzilla.redhat.com/677446, see also redefine_filedir source Patch0: %{name}-1.99-noblacklist.patch +# Commands included in util-linux >= 2.23-rc2 +Patch1: %{name}-2.1-util-linux-223.patch BuildArch: noarch %if %{with tests} @@ -34,6 +36,9 @@ of the programmable completion feature of bash. %prep %setup -q %patch0 -p1 +%if 0%{?fedora} >= 19 +%patch1 -p1 +%endif install -pm 644 %{SOURCE2} . @@ -47,6 +52,11 @@ make install DESTDIR=$RPM_BUILD_ROOT # Updated completion shipped in cowsay package: rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/{cowsay,cowthink} +%if 0%{?fedora} < 18 +# systemd >= 198 ships this one: +install -pm 644 completions/_udevadm \ + $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/udevadm +%endif install -Dpm 644 %{SOURCE3} \ $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/redefine_filedir @@ -76,6 +86,10 @@ exit $result %changelog +* Mon Apr 8 2013 Ville Skyttä - 1:2.1-1 +- Update to 2.1 (fixes #860510, #906469, #912113, #919246, #928253). +- Don't ship completions included in util-linux 2.23-rc2 for F-19+. + * Wed Feb 13 2013 Fedora Release Engineering - 1:2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild