update to 18Jun2019, remove doc dependency, install vim-files

2 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 601481fac336..ff08b28c9311 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lammps-beta
 	pkgdesc = Large-scale Atomic/Molecular Massively Parallel Simulator
-	pkgver = 20190605
+	pkgver = 20190618
 	pkgrel = 1
 	url = https://lammps.sandia.gov/
 	arch = x86_64
@@ -10,8 +10,8 @@ pkgbase = lammps-beta
 	depends = openmpi
 	provides = lammps
 	conflicts = lammps
-	source = lammps-5Jun2019.tar.gz::https://github.com/lammps/lammps/archive/patch_5Jun2019.tar.gz
-	sha512sums = d72a5de3068a902cd8a825c97cd071331d5e3c16429531809178c43930b363f6549bd6802b552c2667e8882f7f21c90bd815072deb5ac19c8687060c796e58b4
+	source = lammps-18Jun2019.tar.gz::https://github.com/lammps/lammps/archive/patch_18Jun2019.tar.gz
+	sha512sums = 0a174deb6d17b61e7471afcbd8d2dddf99d03e7a06046b71d51cc79cb219550199b94d8e465f9d1f0644939ab6302c776588b0c27e5a1ec785ffffe0b6dcd614
 
 pkgname = lammps-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index ad180a77464c..66c154028285 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,8 +21,8 @@ _ENABLE_OMP=0
 
 _pkgname=lammps
 pkgname=${_pkgname}-beta
-pkgver=20190605
-_pkgver="5Jun2019"
+pkgver=20190618
+_pkgver="18Jun2019"
 #_pkgver=$(date -d ${pkgver} +%-d%b%Y)
 pkgrel=1
 pkgdesc="Large-scale Atomic/Molecular Massively Parallel Simulator"
@@ -34,7 +34,7 @@ makedepends=('cmake')
 conflicts=('lammps')
 provides=('lammps')
 source=("${_pkgname}-${_pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/patch_${_pkgver}.tar.gz")
-sha512sums=('d72a5de3068a902cd8a825c97cd071331d5e3c16429531809178c43930b363f6549bd6802b552c2667e8882f7f21c90bd815072deb5ac19c8687060c796e58b4')
+sha512sums=('0a174deb6d17b61e7471afcbd8d2dddf99d03e7a06046b71d51cc79cb219550199b94d8e465f9d1f0644939ab6302c776588b0c27e5a1ec785ffffe0b6dcd614')
 
 # process the build settings from above
 if (( $_ENABLE_INTEL_COMPILER )); then
@@ -45,7 +45,7 @@ if (( $_ENABLE_INTEL_COMPILER )); then
     _feature_args+=('-DCMAKE_Fortran_COMPILER=mpiifort')
 fi
 if (( $_BUILD_DOC )); then
-    makedepends+=('python-sphinx' 'lammpsdoc')
+    makedepends+=('python-sphinx')
 fi
 if (( $_ENABLE_KIM )); then
     depends+=('kim-api>=2.0.2')
@@ -85,7 +85,7 @@ build() {
     do
       tmp=${file%.*} # Strips the '.txt' extension
       fname=${tmp##*/} # Strips the path prefixing the file-name
-      txt2rst ${file} > "rst/${fname}.rst"
+      ../doc/utils/converters/lammpsdoc/txt2rst.py ${file} > "rst/${fname}.rst"
     done
 
     # Generate HTML from ReStructuredText files
@@ -115,4 +115,6 @@ package() {
     cp -r "../examples/"* "${pkgdir}/usr/share/examples/lammps/"
     find "${pkgdir}/usr/share/examples/lammps/" -type f -exec chmod 644 '{}' +
   fi
+  install -Dm644 "../tools/vim/lammps.vim" "${pkgdir}/usr/share/vim/vimfiles/syntax/lammps.vim"
+  install -Dm644 "../tools/vim/filetype.vim" "${pkgdir}/usr/share/vim/vimfiles/ftdetect/lammps.vim"
 }