X-Original-To: alpine-aports@lists.alpinelinux.org Received: from fx.arvanta.net (static-213-198-238-194.adsl.eunet.rs [213.198.238.194]) by lists.alpinelinux.org (Postfix) with ESMTP id 12A77F8146B for ; Wed, 24 Apr 2019 20:34:05 +0000 (UTC) Received: from arya.arvanta.net (arya.arvanta.net [10.5.1.6]) by fx.arvanta.net (Postfix) with ESMTP id 2938B5031; Wed, 24 Apr 2019 22:34:04 +0200 (CEST) From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= To: alpine-aports@lists.alpinelinux.org Cc: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= Subject: [alpine-aports] [PATCH] main/vim: fix vimdiff dependency on gvim Date: Wed, 24 Apr 2019 22:34:00 +0200 Message-Id: <20190424203400.24388-1-mps@arvanta.net> X-Mailer: git-send-email 2.20.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit remove conflicts in gvim subpackage --- main/vim/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD index 88a3a4c1c4..661b9fe462 100644 --- a/main/vim/APKBUILD +++ b/main/vim/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa pkgname=vim pkgver=8.1.1075 -pkgrel=0 +pkgrel=1 pkgdesc="Improved vi-style text editor" url="https://www.vim.org/" arch="all" @@ -80,7 +80,6 @@ package() { gvim() { pkgdesc="advanced text editor, with GUI" - conflicts="vim" provides="vim" cd "$builddir"-gvim make -j1 DESTDIR="$subpkgdir/" install @@ -93,7 +92,8 @@ gvim() { vimdiff() { pkgdesc="view file diffs in vim" - depends="diffutils" + depends="diffutils vim" + options="!tracedeps" install -d "$subpkgdir"/usr/bin mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin -- 2.20.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---