vim-runtime: remove parabola suffix, add complex pkgrel and add vim-runtime in provides array with the same pkgrel than Arch to solve requirements of the vim packages

3 files changed, 7 insertions, 7 deletions

diff --git a/libre/vim-runtime-parabola/PKGBUILD b/libre/vim-runtime/PKGBUILD
index a3a410e6f..2a3d40b03 100644
--- a/libre/vim-runtime-parabola/PKGBUILD
+++ b/libre/vim-runtime/PKGBUILD
@@ -6,14 +6,14 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=vim
-_pkgname=vim-runtime
-pkgname=vim-runtime-parabola
+pkgname=vim-runtime
 _topver=7.4
 _patchlevel=410
 __hgrev=7af530381fec
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=1
+_pkgrel=1
+pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
 url="http://www.vim.org"
@@ -59,13 +59,13 @@ build() {
   make
 }
 
-package_vim-runtime-parabola() {
+package_vim-runtime() {
   pkgdesc='Runtime for vim and gvim (Parabola rebranded)'
   depends=('perl' 'gawk')
   backup=('etc/vimrc')
-  replaces=($_pkgname)
-  conflicts=($_pkgname)
-  provides=($_pkgname=$pkgver)
+  replaces=(${pkgname}-parabola)
+  conflicts=(${pkgname}-parabola)
+  provides=(${pkgname}=${pkgver}-${_pkgrel})
 
   cd "${srcdir}"/vim-build
 
diff --git a/libre/vim-runtime-parabola/parabola.vim b/libre/vim-runtime/parabola.vim
index 3db882946..3db882946 100644
--- a/libre/vim-runtime-parabola/parabola.vim
+++ b/libre/vim-runtime/parabola.vim
diff --git a/libre/vim-runtime-parabola/vimrc b/libre/vim-runtime/vimrc
index fc67e7eb0..fc67e7eb0 100644
--- a/libre/vim-runtime-parabola/vimrc
+++ b/libre/vim-runtime/vimrc