- merged 2.8 from PLD

diff --git a/bash-completion.spec b/bash-completion.spec
index 5ba1c44d6c00ca773cde4db77b58940889a3d630..6f9ad9aed6ad868bb2686d61aca5fa7b9b1a355b 100644 (file)
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -5,22 +5,22 @@
 Summary:       bash-completion offers programmable completion for bash
 Summary(pl.UTF-8):     Programowalne uzupełnianie nazw dla basha
 Name:          bash-completion
-Version:       2.1
-Release:       5
+Version:       2.8
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Applications/Shells
-Source0:       http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 4e2a9f11a4042a38ee79ddcd048e8b9e
+Source0:       https://github.com/scop/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 201b6ae62f7d5fb5b1b25e34427db919
 Source1:       %{name}-poldek.sh
 # https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/106975
 Source3:       http://launchpadlibrarian.net/19164189/mysqldump
 # Source3-md5: 09e4885be92e032400ed702f39925d85
-Source4:       pear
+Source4:       http://svn.php.net/viewvc/pear2/sandbox/PEAR_BashCompletion/trunk/pear?revision=285425&view=co?/pear
 # Source4-md5: 8ce77e4459e2c45e2096da8d03c8f43d
 Patch0:                %{name}-rpm-cache.patch
 Patch1:                pear.patch
-URL:           http://bash-completion.alioth.debian.org/
+URL:           https://github.com/scop/bash-completion
 BuildRequires: sed >= 4.0
 Requires(triggerpostun):       sed >= 4.0
 Requires:      bash >= 4.1
@@ -69,19 +69,16 @@ 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/{cal,chsh,dmesg,eject,hexdump,hwclock,ionice,look,newgrp,renice,rtcwake,su}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/{mount,umount}
 # No package matches '*/apache2ctl'
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/apache2ctl
-# No TLD package or no such binary to complete on
+# No PLD package or no such binary to complete on
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/{larch,lisp,monodevelop,[pg]4,cowsay,cowthink,cpan2dist}
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/{mkinitrd,rpmcheck}
 # 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}
-# NetworkManager stuff
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/completions/nmcli
-
 
 # do not generate autodeps
 chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}/helpers/perl
@@ -94,7 +91,7 @@ sed -i -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES README
+%doc AUTHORS CHANGES README.md
 /etc/shrc.d/bash_completion.sh
 %dir %{_sysconfdir}/bash_completion.d
 %dir %{_datadir}/%{name}
@@ -103,4 +100,5 @@ sed -i -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc
 %{_datadir}/%{name}/completions/*
 %dir %{_datadir}/%{name}/helpers
 %attr(755,root,root) %{_datadir}/%{name}/helpers/perl
+%attr(755,root,root) %{_datadir}/%{name}/helpers/python
 %{_npkgconfigdir}/bash-completion.pc