bumped to version 2.1.0

3 files changed, 34 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9acb497f85a..9df80e7ff331 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu May  4 16:18:10 UTC 2017
+# Sat Jul  1 14:43:19 UTC 2017
 pkgbase = openhab2
 	pkgdesc = openHAB2 open source home automation software
-	pkgver = 2.0.0
-	pkgrel = 2
+	pkgver = 2.1.0
+	pkgrel = 1
 	url = http://www.openhab.org/
 	install = openhab2.install
 	arch = any
@@ -11,19 +11,19 @@ pkgbase = openhab2
 	depends = java-runtime-headless>=8
 	conflicts = openhab-runtime
 	conflicts = openhab-addons
-	noextract = openhab-2.0.0.tar.gz
+	noextract = openhab-2.1.0.tar.gz
 	backup = etc/openhab2/services/addons.cfg
 	backup = etc/openhab2/services/runtime.cfg
-	source = openhab-2.0.0.tar.gz::https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.0.0%2Fopenhab-2.0.0.tar.gz
+	source = openhab-2.1.0.tar.gz::https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F2.1.0%2Fopenhab-2.1.0.tar.gz
 	source = openhab2.service
 	source = openhab2.default
 	source = openhab2.install
 	source = openhab2.patch
-	sha256sums = b40ba9bae69326cbb36af87e7f335bb90af02b11bce638a7c3838aed64f3ce8b
+	sha256sums = 19a5f7dd5a130392b79bcd7348c0b1e54bf4d8a4d0cf4398b56a561f15e213f1
 	sha256sums = c1774dc42bbc1b166fc3823351c1d73edf1a40dae628aa33400f585cdd6487ad
 	sha256sums = b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7
 	sha256sums = a5ef3d048ab20e73bbb2684fcb3a8b64f9fd1d437bde54b7e51b379d1dacd79e
-	sha256sums = d2e5481eebc6da6f612699c6dcbd9b32f06cf672a17b95dbdd4f3bbdc04d5e23
+	sha256sums = 188ae4cc4e519fbbf5c370cf39bc2a7788d5ab2aab5d766e2adf1b84aeedd9e9
 
 pkgname = openhab2
 
diff --git a/PKGBUILD b/PKGBUILD
index 42bae1df66de..db56932de9bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christoph Scholz <christoph.scholz@gmail.com>
 pkgname=openhab2
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.1.0
+pkgrel=1
 pkgdesc="openHAB2 open source home automation software"
 arch=('any')
 url="http://www.openhab.org/"
@@ -22,11 +22,11 @@ source=("openhab-${pkgver}.tar.gz::https://bintray.com/openhab/mvn/download_file
 
 noextract=("openhab-${pkgver}.tar.gz")
 
-sha256sums=('b40ba9bae69326cbb36af87e7f335bb90af02b11bce638a7c3838aed64f3ce8b'
+sha256sums=('19a5f7dd5a130392b79bcd7348c0b1e54bf4d8a4d0cf4398b56a561f15e213f1'
   	'c1774dc42bbc1b166fc3823351c1d73edf1a40dae628aa33400f585cdd6487ad'
 	'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7'
 	'a5ef3d048ab20e73bbb2684fcb3a8b64f9fd1d437bde54b7e51b379d1dacd79e'
-	'd2e5481eebc6da6f612699c6dcbd9b32f06cf672a17b95dbdd4f3bbdc04d5e23')
+	'188ae4cc4e519fbbf5c370cf39bc2a7788d5ab2aab5d766e2adf1b84aeedd9e9')
 
 prepare() {
 	mkdir ${srcdir}/openhab2
diff --git a/openhab2.patch b/openhab2.patch
index fd2552328dda..806ecbe390e2 100644
--- a/openhab2.patch
+++ b/openhab2.patch
@@ -1,17 +1,26 @@
 diff -ura openhab2.orig/runtime/bin/oh2_dir_layout openhab2.new/runtime/bin/oh2_dir_layout
---- openhab2.orig/runtime/bin/oh2_dir_layout	2017-01-21 12:35:42.000000000 +0100
-+++ openhab2.new/runtime/bin/oh2_dir_layout	2017-05-04 17:53:51.790080596 +0200
-@@ -4,10 +4,10 @@
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
+--- openhab2.orig/runtime/bin/oh2_dir_layout	2017-06-27 23:14:06.000000000 +0200
++++ openhab2.new/runtime/bin/oh2_dir_layout	2017-07-01 14:54:58.966716130 +0200
+@@ -6,7 +6,7 @@
  export OPENHAB_HOME=`cd "$DIRNAME/../.."; pwd`
--export OPENHAB_CONF="${OPENHAB_HOME}/conf"
-+export OPENHAB_CONF="/etc/openhab2"
- export OPENHAB_RUNTIME="${OPENHAB_HOME}/runtime"
--export OPENHAB_USERDATA="${OPENHAB_HOME}/userdata"
--export OPENHAB_LOGDIR="${OPENHAB_USERDATA}/logs"
-+export OPENHAB_USERDATA="/var/lib/openhab2"
-+export OPENHAB_LOGDIR="/var/log/openhab2"
  
- export KARAF_HOME="${OPENHAB_RUNTIME}"
- export KARAF_DATA="${OPENHAB_USERDATA}"
+ if [ -z ${OPENHAB_CONF} ]; then
+-    export OPENHAB_CONF="${OPENHAB_HOME}/conf"
++    export OPENHAB_CONF="/etc/openhab2"
+ fi
+ 
+ if [ -z ${OPENHAB_RUNTIME} ]; then
+@@ -14,11 +14,11 @@
+ fi
+ 
+ if [ -z ${OPENHAB_USERDATA} ]; then
+-    export OPENHAB_USERDATA="${OPENHAB_HOME}/userdata"
++    export OPENHAB_USERDATA="/var/lib/openhab2"
+ fi
+ 
+ if [ -z ${OPENHAB_LOGDIR} ]; then
+-    export OPENHAB_LOGDIR="${OPENHAB_USERDATA}/logs"
++    export OPENHAB_LOGDIR="/var/log/openhab2"
+ fi
+ 
+ # Make sure the tmp folder exists as Karaf requires it