[arch-commits] Commit in bash-completion/trunk (2 files)

[Dave Reisner]

    Date: Sunday, May 1, 2016 @ 15:44:38
  Author: dreisner
Revision: 266731

upgpkg: bash-completion 2.3-4

- dont install mpv symlink (FS#49121)

Added:
  bash-completion/trunk/mpv-dont-install-symlink.patch
Modified:
  bash-completion/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |    9 ++++++---
 mpv-dont-install-symlink.patch |   23 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-01 11:42:25 UTC (rev 266730)
+++ PKGBUILD	2016-05-01 13:44:38 UTC (rev 266731)
@@ -3,7 +3,7 @@
 
 pkgname=bash-completion
 pkgver=2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Programmable completion for the bash shell"
 arch=('any')
 url="https://github.com/scop/bash-completion"
@@ -11,13 +11,16 @@
 depends=('bash')
 options=('!emptydirs' '!makeflags')
 source=("https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz"
-        'bash-4.3.patch')
+        'bash-4.3.patch'
+        'mpv-dont-install-symlink.patch')
 sha1sums=('6b42d6747dab48bdc983627e8ce69283ff0e6b79'
-          'd2a01350990c1221bd53d55edf31210c74d02bca')
+          'd2a01350990c1221bd53d55edf31210c74d02bca'
+          '6bee621dc456190d629df108350925982d432bb5')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i ../bash-4.3.patch
+  patch -p1 -i ../mpv-dont-install-symlink.patch
 }
 
 build() {

Added: mpv-dont-install-symlink.patch
===================================================================
--- mpv-dont-install-symlink.patch	                        (rev 0)
+++ mpv-dont-install-symlink.patch	2016-05-01 13:44:38 UTC (rev 266731)
@@ -0,0 +1,23 @@
+From 0382773bbfc21dc1fb5467c1c0426ea3c984b6ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Sat, 9 Apr 2016 20:06:57 +0300
+Subject: [PATCH] mpv: Don't install symlink for it, fixes #24
+
+This was a leftover from 00abd48e5b1d5d79fff46b7f791b2b90d1d6953b
+---
+ completions/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/completions/Makefile.am b/completions/Makefile.am
+index 99c283c..5558d50 100644
+--- a/completions/Makefile.am
++++ b/completions/Makefile.am
+@@ -802,7 +802,7 @@ symlinks: $(targetdir) $(DATA)
+ 		rm -f $(targetdir)/$$file && \
+ 			$(LN_S) mcrypt $(targetdir)/$$file ; \
+ 	done
+-	for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
++	for file in mplayer2 mencoder gmplayer kplayer ; do \
+ 		rm -f $(targetdir)/$$file && \
+ 			$(LN_S) mplayer $(targetdir)/$$file ; \
+ 	done