Bump to 4.6.1

2 files changed, 10 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab86386987b7..ef5ae0595096 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
+# Generated by mksrcinfo v8
+# Tue Sep  6 12:12:20 UTC 2016
 pkgbase = vim-puppet
 	pkgdesc = Puppet language syntax highlighting for vim.
-	pkgver = 4.2.1
+	pkgver = 4.6.1
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/puppetlabs/puppet/tree/master/ext/vim/
 	arch = any
 	license = Apache
 	depends = vim
-	source = https://github.com/puppetlabs/puppet/archive/4.2.1.tar.gz
-	sha256sums = e3f076b307e106e698f7f77c05edf0eb74b0ce7fd8094b9107e81f929ace8df2
+	conflicts = puppet
+	source = https://github.com/puppetlabs/puppet/archive/4.6.1.tar.gz
+	sha256sums = 246eb58f4cc98de41a272f91234ce6a1c56a94afeaec0ed7358706baa7151dd7
 
 pkgname = vim-puppet
 
diff --git a/PKGBUILD b/PKGBUILD
index dea4613f4f6a..eb036df33fc4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mario Finelli <mario dot finelli at yahoo dot com>
 
 pkgname=vim-puppet
-pkgver=4.2.1
+pkgver=4.6.1
 pkgrel=1
 epoch=1
 pkgdesc="Puppet language syntax highlighting for vim."
@@ -9,8 +9,9 @@ arch=('any')
 url="https://github.com/puppetlabs/puppet/tree/master/ext/vim/"
 license=('Apache')
 depends=('vim')
+conflicts=('puppet')
 source=("https://github.com/puppetlabs/puppet/archive/${pkgver}.tar.gz")
-sha256sums=('e3f076b307e106e698f7f77c05edf0eb74b0ce7fd8094b9107e81f929ace8df2')
+sha256sums=('246eb58f4cc98de41a272f91234ce6a1c56a94afeaec0ed7358706baa7151dd7')
 
 package() {
     cd "${srcdir}/puppet-${pkgver}/ext/vim"
@@ -21,5 +22,5 @@ package() {
     install -Dm644 ftdetect/puppet.vim "$_vimdir"/ftdetect/puppet.vim
     install -Dm644 ftplugin/puppet.vim "$_vimdir"/ftplugin/puppet.vim
     install -Dm644 indent/puppet.vim "$_vimdir"/indent/puppet.vim
-    install -Dm644 syntax/puppet.vim "$_vimdir"/indent/puppet.vim
+    install -Dm644 syntax/puppet.vim "$_vimdir"/syntax/puppet.vim
 }