changed srcinfo accordingly

3 files changed, 53 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a19556f7572..f9acb497f85a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,29 @@
 # Generated by mksrcinfo v8
-# Wed May  3 13:23:19 UTC 2017
+# Thu May  4 16:18:10 UTC 2017
 pkgbase = openhab2
 	pkgdesc = openHAB2 open source home automation software
 	pkgver = 2.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.openhab.org/
+	install = openhab2.install
 	arch = any
 	license = EPL
 	depends = java-runtime-headless>=8
 	conflicts = openhab-runtime
 	conflicts = openhab-addons
 	noextract = openhab-2.0.0.tar.gz
-	backup = etc/openhab2/conf/services/addons.cfg
-	backup = etc/openhab2/conf/services/runtime.cfg
+	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 = openhab2.service
+	source = openhab2.default
+	source = openhab2.install
+	source = openhab2.patch
 	sha256sums = b40ba9bae69326cbb36af87e7f335bb90af02b11bce638a7c3838aed64f3ce8b
-	sha256sums = a115b9883b3e46c8d29d1a9e47aa1bdf4688de96290794d654783a7d7e34f538
+	sha256sums = c1774dc42bbc1b166fc3823351c1d73edf1a40dae628aa33400f585cdd6487ad
+	sha256sums = b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7
+	sha256sums = a5ef3d048ab20e73bbb2684fcb3a8b64f9fd1d437bde54b7e51b379d1dacd79e
+	sha256sums = d2e5481eebc6da6f612699c6dcbd9b32f06cf672a17b95dbdd4f3bbdc04d5e23
 
 pkgname = openhab2
 
diff --git a/PKGBUILD b/PKGBUILD
index daad6ace5272..42bae1df66de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christoph Scholz <christoph.scholz@gmail.com>
 pkgname=openhab2
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="openHAB2 open source home automation software"
 arch=('any')
 url="http://www.openhab.org/"
@@ -10,34 +10,48 @@ depends=('java-runtime-headless>=8')
 
 conflicts=('openhab-runtime' 'openhab-addons')
 
-backup=('etc/openhab2/conf/services/addons.cfg'
-		'etc/openhab2/conf/services/runtime.cfg')
+backup=('etc/openhab2/services/addons.cfg'
+		'etc/openhab2/services/runtime.cfg')
+install="${pkgname}.install"
 
 source=("openhab-${pkgver}.tar.gz::https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F${pkgver}%2Fopenhab-${pkgver}.tar.gz"
-        "openhab2.service")
+        "openhab2.service"
+	"openhab2.default"
+	"openhab2.install"
+	"openhab2.patch")
 
 noextract=("openhab-${pkgver}.tar.gz")
 
 sha256sums=('b40ba9bae69326cbb36af87e7f335bb90af02b11bce638a7c3838aed64f3ce8b'
-  	'a115b9883b3e46c8d29d1a9e47aa1bdf4688de96290794d654783a7d7e34f538')
+  	'c1774dc42bbc1b166fc3823351c1d73edf1a40dae628aa33400f585cdd6487ad'
+	'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7'
+	'a5ef3d048ab20e73bbb2684fcb3a8b64f9fd1d437bde54b7e51b379d1dacd79e'
+	'd2e5481eebc6da6f612699c6dcbd9b32f06cf672a17b95dbdd4f3bbdc04d5e23')
 
 prepare() {
 	mkdir ${srcdir}/openhab2
 	cd ${srcdir}/openhab2
 	tar xzf ${srcdir}/openhab-${pkgver}.tar.gz
+	patch -p1 < ../openhab2.patch
 }
 
 package() {
-	cd ${pkgdir}
 
-	mkdir -p etc/openhab2
-	mkdir -p opt
-	mkdir -p usr/lib/systemd/system
+	install -Dm644 openhab2.default "${pkgdir}/etc/default/openhab2"
+	install -Dm644 openhab2.service "${pkgdir}/usr/lib/systemd/system/openhab2.service"
 
-	cp ${srcdir}/openhab2.service usr/lib/systemd/system
 
-	cp -r ${srcdir}/openhab2 opt
+	mkdir -p "${pkgdir}/etc/openhab2"
+	cp -r ${srcdir}/openhab2/conf/* "${pkgdir}/etc/openhab2"
 
-	mv opt/openhab2/conf etc/openhab2/conf
-	ln -s /etc/openhab2/conf opt/openhab2/conf
+	mkdir -p "${pkgdir}/var/lib/openhab2"
+	cp -r ${srcdir}/openhab2/userdata/* "${pkgdir}/var/lib/openhab2"
+
+	mkdir -p "${pkgdir}/usr/share"
+	cp -r "${srcdir}/openhab2" "${pkgdir}/usr/share"
+        rm -fr "${pkgdir}/usr/share/openhab2/conf"
+        rm -fr "${pkgdir}/usr/share/openhab2/userdata"
+
+	mkdir -p "${pkgdir}/var/log/openhab2"
+	
 }
diff --git a/openhab2.service b/openhab2.service
index d99242442cc2..8cd50ecf5a66 100644
--- a/openhab2.service
+++ b/openhab2.service
@@ -1,11 +1,21 @@
 [Unit]
-Description=OpenHAB2 home automation software
+Description=openHAB 2 - empowering the smart home
+Documentation=http://docs.openhab.org
+Documentation=https://community.openhab.org
 After=syslog.target network.target
 
 [Service]
-Type=simple
-ExecStart=/opt/openhab2/start.sh
-ExecReload=/usr/bin/kill -HUP $MAINPID
+EnvironmentFile=/etc/default/openhab2
+User=openhab
+Group=openhab
+WorkingDirectory=/usr/share/openhab2
+#PermissionsStartOnly=true
+#ExecStartPre=/usr/share/openhab/bin/setpermissions.sh
+ExecStart=/usr/share/openhab2/start.sh server
+ExecStop=/usr/share/openhab2/runtime/bin/stop
+# Shutdown delay in seconds, before process is tried to be killed with KILL (if configured)
+TimeoutStopSec=120
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target