Update voltdb

2 files changed, 21 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ebea744785d..1cc26aa4d7f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = voltdb
 	pkgdesc = An in-memory database with pre-compiled Java stored procedures (Community Edition)
-	pkgver = 5.2.2
+	pkgver = 5.7.1
 	pkgrel = 1
 	url = http://voltdb.com/
 	arch = i686
@@ -9,10 +9,10 @@ pkgbase = voltdb
 	makedepends = apache-ant
 	makedepends = python2-virtualenv
 	depends = python2
-	depends = java-environment
+	depends = java-environment-jdk=7
 	conflicts = voltdb-enterprise
-	source = https://github.com/voltdb/voltdb/archive/voltdb-5.2.2.tar.gz
-	md5sums = d7ec786c8bda25c5d47b32850daf30fe
+	source = https://github.com/voltdb/voltdb/archive/voltdb-5.7.1.tar.gz
+	md5sums = e1d668a35d979fffdbb85d3f1a12bcf8
 
 pkgname = voltdb
 
diff --git a/PKGBUILD b/PKGBUILD
index cbd57ebf6e7a..7fe402703925 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: D. Can Celasun <dcelasun[at]gmail[dot]com>
 pkgname=voltdb
-pkgver=5.2.2
+pkgver=5.7.1
 pkgrel=1
 pkgdesc="An in-memory database with pre-compiled Java stored procedures (Community Edition)"
 arch=('i686' 'x86_64')
 url="http://voltdb.com/"
 license=('AGPL3')
-depends=('python2' 'java-environment')
+depends=('python2' 'java-environment-jdk=7')
 makedepends=('apache-ant' 'python2-virtualenv')
 conflicts=('voltdb-enterprise')
 source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d7ec786c8bda25c5d47b32850daf30fe')
+md5sums=('e1d668a35d979fffdbb85d3f1a12bcf8')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgname}-${pkgver}
@@ -19,7 +19,12 @@ build() {
   /usr/bin/virtualenv2 --no-site-packages voltdb_env
   source voltdb_env/bin/activate
   
-  find -name '*.py' -exec sed -i 's|^#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' {} \;
+  find . -type f -exec sed -i 's|^#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' {} \;
+  find . -type f -exec sed -i 's|^#!/usr/bin/python\s*$|#!/usr/bin/python2|' {} \;
+
+  export PATH=/usr/lib/jvm/java-7-jdk/jre/bin:/usr/lib/jvm/java-7-jdk/jre/bin:$PATH
+  
+  sed -i 's/-Werror//g' "${srcdir}"/voltdb-voltdb-${pkgver}/build.py
 
   ant clean
   ant -Djmemcheck=NO_MEMCHECK dist
@@ -28,20 +33,20 @@ build() {
 package() {
     mkdir -p "${pkgdir}/opt/voltdb"
     mkdir -p "${pkgdir}/usr/bin"
-    
-    tar -xzvf "${srcdir}"/${pkgname}-${pkgname}-${pkgver}/obj/release/${pkgname}-${pkgver}.tar.gz -C "${pkgdir}"/opt/${pkgname}
-    
-    mv "${pkgdir}"/opt/${pkgname}/${pkgname}-${pkgver}/* "${pkgdir}"/opt/${pkgname}
-    
-    rm -rf "${pkgdir}"/opt/${pkgname}/${pkgname}-${pkgver}
-    
+
+    mv "${srcdir}"/${pkgname}-${pkgname}-${pkgver}/{bin,bundles,doc,examples,lib,third_party,tools,voltdb,LICENSE,README,version.txt} "${pkgdir}"/opt/${pkgname}
+    mv "${srcdir}"/${pkgname}-${pkgname}-${pkgver}/obj/release/*.tar.gz "${pkgdir}"/opt/${pkgname}/voltdb
+
     cd "${pkgdir}"/opt/${pkgname}
     find -name '*.py' -exec sed -i 's|^#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' {} \;
-    find bin -exec sed -i 's|^#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' {} \;
+    find -name '*.pyc' -type f -delete
     
     ln -s /opt/voltdb/bin/csvloader "${pkgdir}"/usr/bin/csvloader
     ln -s /opt/voltdb/bin/jdbcloader "${pkgdir}"/usr/bin/jdbcloader
     ln -s /opt/voltdb/bin/kafkaloader "${pkgdir}"/usr/bin/kafkaloader
+    ln -s /opt/voltdb/bin/rabbitmqloader "${pkgdir}"/usr/bin/rabbitmqloader
+    ln -s /opt/voltdb/bin/snapshotconvert "${pkgdir}"/usr/bin/snapshotconvert
+    ln -s /opt/voltdb/bin/snapshotverifier "${pkgdir}"/usr/bin/snapshotverifier
     ln -s /opt/voltdb/bin/sqlcmd "${pkgdir}"/usr/bin/sqlcmd
     ln -s /opt/voltdb/bin/voltadmin "${pkgdir}"/usr/bin/voltadmin
     ln -s /opt/voltdb/bin/voltcompiler "${pkgdir}"/usr/bin/voltcompiler