summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mattern2016-06-30 14:48:52 +0200
committerPeter Mattern2016-06-30 14:48:52 +0200
commit2e9089e50a8744015bd58bffbd79845b34970241 (patch)
tree217c12e180a2cc1a8449ff48efce1941b79d1f8f
parent0d5a2ebfd7b56e19bfb105cfa99d96e6dad05311 (diff)
downloadaur-2e9089e50a8744015bd58bffbd79845b34970241.tar.gz
Fix typo in variable "conflicts"
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6f710a3ba37..09780a5fcce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 0bf94528d56..f33b672b13e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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"