few fixes and add systemd files

6 files changed, 67 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0669fb20394d..599bde17b12d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,35 @@
 # Generated by mksrcinfo v8
-# Tue May 30 17:34:31 UTC 2017
+# Mon Jun  5 14:57:26 UTC 2017
 pkgbase = gerbera
 	pkgdesc = UPnP Media Server
 	pkgver = 1.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/v00d00/gerbera
+	install = gerbera.install
 	arch = i686
 	arch = x86_64
+	arch = armv7h
 	license = GPL2
+	makedepends = cmake
 	depends = taglib
 	depends = curl
 	depends = sqlite
 	depends = file
 	depends = libmariadbclient
 	depends = gcc-libs
-	depends = pupnp>=1.8.0
+	depends = pupnp
 	depends = duktape
 	depends = libexif
 	depends = expat
+	options = emptydirs
 	source = gerbera-1.0.0.tar.gz::https://github.com/v00d00/gerbera/archive/v1.0.0.tar.gz
+	source = gerbera-mysql.service
+	source = gerbera.service
+	source = gerbera.sysusers
 	sha256sums = 297c26e0b4223ea96cc6db403e2a2e8f81c51b64284535f3bc644abf24f66975
+	sha256sums = f8abf002308fabb8327f3bff0fd100357360921fcbfde61795f044af96ab9257
+	sha256sums = 766383ece7e5fc308b52d8c9df3924e31c65e0ac0a954033248c7d80a8c40140
+	sha256sums = b3f956a6eaee8753cff7a04b51091b8b283dd0da054190ced13362a5b050d73f
 
 pkgname = gerbera
 
diff --git a/PKGBUILD b/PKGBUILD
index e923c103e3e7..e51470c834ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,24 @@
 
 pkgname=gerbera
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="UPnP Media Server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 armv7h)
 url="https://github.com/v00d00/gerbera"
 license=('GPL2')
-depends=('taglib' 'curl' 'sqlite' 'file' 'libmariadbclient' 'gcc-libs' 'pupnp>=1.8.0'
+depends=('taglib' 'curl' 'sqlite' 'file' 'libmariadbclient' 'gcc-libs' 'pupnp'
 	 'duktape' 'libexif' 'expat')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/v00d00/gerbera/archive/v$pkgver.tar.gz")
-sha256sums=('297c26e0b4223ea96cc6db403e2a2e8f81c51b64284535f3bc644abf24f66975')
+makedepends=('cmake')
+install=gerbera.install
+options=('emptydirs')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/v00d00/gerbera/archive/v$pkgver.tar.gz"
+	gerbera-mysql.service
+	gerbera.service
+	gerbera.sysusers)
+sha256sums=('297c26e0b4223ea96cc6db403e2a2e8f81c51b64284535f3bc644abf24f66975'
+            'f8abf002308fabb8327f3bff0fd100357360921fcbfde61795f044af96ab9257'
+            '766383ece7e5fc308b52d8c9df3924e31c65e0ac0a954033248c7d80a8c40140'
+            'b3f956a6eaee8753cff7a04b51091b8b283dd0da054190ced13362a5b050d73f')
 
 build() {
 	cd "$pkgname-$pkgver"
@@ -23,6 +32,8 @@ package() {
 	cd "$pkgname-$pkgver"
 	make DESTDIR="$pkgdir/" install
 
-	mkdir -p "$pkgdir"/usr/lib/systemd
-	cp -a scripts/systemd "$pkgdir"/usr/lib/systemd/system
+	install -dm0755 "$pkgdir"/var/lib/gerbera
+	install -Dm0644 "$srcdir"/gerbera.sysusers "$pkgdir"/usr/lib/sysusers.d/gerbera.conf
+	install -Dm0644 "$srcdir"/gerbera-mysql.service "$pkgdir"/usr/lib/systemd/system/gerbera-mysql.service
+	install -Dm0644 "$srcdir"/gerbera.service "$pkgdir"/usr/lib/systemd/system/gerbera.service
 }
diff --git a/gerbera-mysql.service b/gerbera-mysql.service
new file mode 100644
index 000000000000..b539be455a5f
--- /dev/null
+++ b/gerbera-mysql.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Gerbera Media Server with MySQL
+After=mysql.target network.target
+
+[Service]
+Type=simple
+User=gerbera
+Group=gerbera
+ExecStart=/usr/bin/gerbera --cfgdir etc
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/gerbera.install b/gerbera.install
new file mode 100644
index 000000000000..abd3db404bfb
--- /dev/null
+++ b/gerbera.install
@@ -0,0 +1,7 @@
+post_install() {
+  echo "-- Please do chown -R gerbera:gerbera /var/lib/gerbera"
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/gerbera.service b/gerbera.service
new file mode 100644
index 000000000000..4df73f0b31b9
--- /dev/null
+++ b/gerbera.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Gerbera Media Server
+After=network.target
+
+[Service]
+Type=simple
+User=gerbera
+Group=gerbera
+ExecStart=/usr/bin/gerbera --cfgdir etc
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/gerbera.sysusers b/gerbera.sysusers
new file mode 100644
index 000000000000..7fe1d69d8b18
--- /dev/null
+++ b/gerbera.sysusers
@@ -0,0 +1 @@
+u gerbera   -      "gerbera server" /var/lib/gerbera