update nodejs-version check

3 files changed, 12 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 764b0b766717..ab4bf50cf905 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Feb 17 14:53:29 UTC 2016
 pkgbase = etherpad-lite
 	pkgdesc = Lightweight fork of etherpad based on javascript
 	pkgver = 1.5.7
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = http://etherpad.org
 	install = etherpad-lite.install
@@ -10,7 +12,7 @@ pkgbase = etherpad-lite
 	depends = curl
 	depends = python2
 	depends = openssl
-	depends = nodejs<5
+	depends = nodejs
 	depends = git
 	depends = npm
 	optdepends = sqlite: to use sqlite as databse
@@ -21,10 +23,10 @@ pkgbase = etherpad-lite
 	backup = etc/webapps/etherpad-lite/settings.json
 	source = etherpad-lite-1.5.7.tar.gz::https://github.com/ether/etherpad-lite/archive/1.5.7.tar.gz
 	source = etherpad-lite.service
-	source = fix-v4.x-nodejs.patch
+	source = fix-nodejs-version-check.patch
 	sha512sums = 688205194347f0e4e6f78deb0b189ceaa4f2255efcbaa503d0b6459de8505dd475aa9151399dd818b6cac232bc0b71e5a0fbd6d43f56cb5ce1f9eafcccb3925b
 	sha512sums = 7b775171da97a3e7ad44a2b1b319970fd307a88e90a171c49bf70d2382767175e98bb21c7054e38ee6c066bd2dfadf94d28a9ff31d4f21145ec4441caa13c4d7
-	sha512sums = f52a204b2879369e230190edb59b3704ae7f7ed8ff41ebfe8e8ffd42c3686148716ee9e04c0ffc417498c44a4a8753f621f7cc2fbfce99171d20c5fe1a0cfc27
+	sha512sums = 85a6f3a7b28ecc6b72bfc4c05db67759ec3bba73040c45339921234683845248e82cb56407da0a804b11f9989d45f59d0dd1f1ab4ee03b81c01c69a000977342
 
 pkgname = etherpad-lite
 
diff --git a/PKGBUILD b/PKGBUILD
index aac704a752b3..c33054988d49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=etherpad-lite
 pkgver=1.5.7
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Lightweight fork of etherpad based on javascript"
 arch=(any)
 url="http://etherpad.org"
 _watch=('http://etherpad.org','Documentation <small>v([\d.]*)</small>')
 license=('GPL2')
-depends=('curl' 'python2' 'openssl' 'nodejs<5' 'git' 'npm')
+depends=('curl' 'python2' 'openssl' 'nodejs' 'git' 'npm')
 optdepends=('sqlite: to use sqlite as databse'
             'mariadb: to use mariadb as database'
             'postgresql: to use postgresql as database')
@@ -20,10 +20,10 @@ backup=('usr/share/webapps/etherpad-lite/settings.json'
 install='etherpad-lite.install'
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ether/${pkgname}/archive/${pkgver}.tar.gz"
         "etherpad-lite.service"
-	"fix-v4.x-nodejs.patch")
+	"fix-nodejs-version-check.patch")
 sha512sums=('688205194347f0e4e6f78deb0b189ceaa4f2255efcbaa503d0b6459de8505dd475aa9151399dd818b6cac232bc0b71e5a0fbd6d43f56cb5ce1f9eafcccb3925b'
             '7b775171da97a3e7ad44a2b1b319970fd307a88e90a171c49bf70d2382767175e98bb21c7054e38ee6c066bd2dfadf94d28a9ff31d4f21145ec4441caa13c4d7'
-	    'f52a204b2879369e230190edb59b3704ae7f7ed8ff41ebfe8e8ffd42c3686148716ee9e04c0ffc417498c44a4a8753f621f7cc2fbfce99171d20c5fe1a0cfc27')
+	    '85a6f3a7b28ecc6b72bfc4c05db67759ec3bba73040c45339921234683845248e82cb56407da0a804b11f9989d45f59d0dd1f1ab4ee03b81c01c69a000977342')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/fix-v4.x-nodejs.patch b/fix-nodejs-version-check.patch
index 1692adaa7156..53ed27fb1f13 100644
--- a/fix-v4.x-nodejs.patch
+++ b/fix-nodejs-version-check.patch
@@ -5,10 +5,10 @@
    IOJS_VERSION=$(iojs --version)
  fi
 -if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ]; then
-+if [ ! ${NODE_V_MINOR:0:3} = "v4." ] && [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ]; then
++if [ ${NODE_V_MINOR:0:3} == "v0." ] && [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ]; then
    if [ ! $IOJS_VERSION ]; then
 -    echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need v0.10.x, v0.11.x or v0.12.x" >&2
-+    echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need v4.x, v0.10.x, v0.11.x or v0.12.x" >&2
++    echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need v0.10.x or higher" >&2
      exit 1
    fi
  fi