diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Jun 30 12:42:14 UTC 2016 +# Thu Jun 30 12:48:23 UTC 2016 pkgbase = gvim-git pkgdesc = Vim the editor. CLI version and GTK2 GUI providing majority of features. pkgver = 7.4.1967 - pkgrel = 1 + pkgrel = 2 url = http://www.vim.org arch = i686 arch = x86_64 @@ -25,8 +25,8 @@ pkgbase = gvim-git provides = xxd conflicts = vim-minimal conflicts = vim-minimal-git + conflicts = vim conflicts = vim-git - conflicts = vim-git-git conflicts = vim-python3 conflicts = gvim conflicts = gvim-python3 @@ -7,7 +7,7 @@ _pkgname=vim pkgname="gvim-git" pkgver=7.4.1967 -pkgrel=1 +pkgrel=2 pkgdesc='Vim the editor. CLI version and GTK2 GUI providing majority of features.' arch=('i686' 'x86_64') url='http://www.vim.org' @@ -17,7 +17,7 @@ optdepends=('lua: Lua interpreter' 'perl: Perl interpreter' 'python: Python 3 in 'python2: Python 2 interpreter' 'ruby: Ruby interpreter') makedepends=('git' 'lua' 'python' 'python2' 'ruby') provides=('gvim' 'xxd') -conflicts=("vim-minimal"{,-git} "vim-git"{,-git} 'vim-python3' "gvim"{,-python3}) +conflicts=("vim-minimal"{,-git} "vim"{,-git} 'vim-python3' "gvim"{,-python3}) source=("git+https://github.com/$_pkgname/$_pkgname.git" "gvim.desktop") sha256sums=("SKIP" |