update, use user service

4 files changed, 21 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 368c6aaccf5f..43c39e4f2105 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu May 18 14:44:34 UTC 2017
+# Sat Jun 10 01:03:07 UTC 2017
 pkgbase = spotifyd
 	pkgdesc = A spotify playing daemon
-	pkgver = 40.a238bd8
-	pkgrel = 2
+	pkgver = 42.73458a2
+	pkgrel = 1
 	url = https://github.com/Spotifyd/spotifyd
 	arch = x86_64
 	makedepends = git
@@ -16,9 +16,9 @@ pkgbase = spotifyd
 	depends = libvorbis
 	conflicts = spotifyd-bin
 	source_x86_64 = spotifyd::git+https://github.com/Spotifyd/spotifyd
-	source_x86_64 = spotifyd@.service
+	source_x86_64 = spotifyd.service
 	md5sums_x86_64 = SKIP
-	md5sums_x86_64 = 230939d3dfe5986ed3587050955b2926
+	md5sums_x86_64 = eb95cf4735565e0c596d7e0118fd1e6e
 
 pkgname = spotifyd
 
diff --git a/PKGBUILD b/PKGBUILD
index 0244bf6c008b..e240392bf1f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 pkgname=spotifyd
-pkgver=40.a238bd8
-pkgrel=2
+pkgver=42.73458a2
+pkgrel=1
 arch=('x86_64')
 depends=('pulseaudio' 'flac' 'libogg' 'libpulse' 'libsndfile' 'libvorbis')
 makedepends=('git' 'cargo')
 conflicts=('spotifyd-bin')
 pkgdesc="A spotify playing daemon"
 url="https://github.com/Spotifyd/spotifyd"
-source_x86_64=("spotifyd::git+https://github.com/Spotifyd/spotifyd" "spotifyd@.service")
+source_x86_64=("spotifyd::git+https://github.com/Spotifyd/spotifyd" "spotifyd.service")
 md5sums_x86_64=('SKIP'
-                '230939d3dfe5986ed3587050955b2926')
+                'eb95cf4735565e0c596d7e0118fd1e6e')
 pkgver() {
 	cd $srcdir/spotifyd;
 	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
@@ -22,5 +22,5 @@ build() {
 
 package() {
   install -D -m 755 $srcdir/spotifyd/target/release/spotifyd "${pkgdir}/usr/bin/spotifyd"
-  install -D -m 644 "${srcdir}/spotifyd@.service" "${pkgdir}/usr/lib/systemd/system/spotifyd@.service"
+  install -D -m 644 "${srcdir}/spotifyd.service" "${pkgdir}/usr/lib/systemd/user/spotifyd.service"
 }
diff --git a/spotifyd.service b/spotifyd.service
new file mode 100644
index 000000000000..df35ce64801d
--- /dev/null
+++ b/spotifyd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A spotify playing daemon
+Documentation=https://github.com/Spotifyd/spotifyd
+
+[Service]
+ExecStart=/usr/bin/spotifyd --no-daemon
+Restart=always
+RestartSec=12
+
+[Install]
+WantedBy=default.target
\ No newline at end of file
diff --git a/spotifyd@.service b/spotifyd@.service
deleted file mode 100644
index 07e3a11f73b1..000000000000
--- a/spotifyd@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=A spotify playing daemon for %i
-
-[Service]
-Type=simple
-User=%i
-ExecStart=/usr/bin/spotifyd --no-daemon
-
-[Install]
-WantedBy=multi-user.target