diff options
| author | Milan P. Stanić <mps@arvanta.net> | 2019-04-24 22:34:00 +0200 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-04-30 06:13:07 +0000 |
| commit | 4f7e620c569c8b448af563d5044a7e5991be6e3a (patch) | |
| tree | bf0d4661d797c67d8c9f3fab2e30a9461f8c1271 /main | |
| parent | 0528182576472cb3b4f561f37c1dccfa64974ee0 (diff) | |
| download | aports-4f7e620c569c8b448af563d5044a7e5991be6e3a.tar.bz2 aports-4f7e620c569c8b448af563d5044a7e5991be6e3a.tar.xz | |
main/vim: fix vimdiff dependency on gvim
remove conflicts in gvim subpackage
Diffstat (limited to 'main')
| -rw-r--r-- | main/vim/APKBUILD | 6 |
1 files 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 <ncopa@alpinelinux.org> 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 |