Moved to using upstream systemd service file

4 files changed, 25 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f5a8c8c1f20..67e1d0209b82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tvheadend
 	pkgdesc = TV streaming server for Linux
 	pkgver = 4.2.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://tvheadend.org/projects/tvheadend
 	install = tvheadend.install
 	arch = i686
@@ -24,9 +24,9 @@ pkgbase = tvheadend
 	provides = tvheadend
 	conflicts = tvheadend-git
 	source = https://github.com/tvheadend/tvheadend/archive/v4.2.6.tar.gz
-	source = tvheadend.service
+	source = tvheadend.override
 	sha256sums = 09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9
-	sha256sums = d8236359f814556d33bd0f009f2626bfbc75486de471dfa355ff1e6916e3ac58
+	sha256sums = bbb54ae46fbb1b00f987c0a8dde644ee9a0121fa173ee21cc6bf7a6a6fb12146
 
 pkgname = tvheadend
 
diff --git a/PKGBUILD b/PKGBUILD
index 860c5a4b2f0c..11876d29ddee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=tvheadend
 
 pkgver=4.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="TV streaming server for Linux"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://tvheadend.org/projects/tvheadend"
@@ -12,19 +12,20 @@ license=('GPL3')
 depends=('avahi' 'ffmpeg' 'uriparser' 'openssl' 'tar')
 makedepends=('git' 'wget' 'python')
 optdepends=('xmltv: For an alternative source of programme listings'
-	    'libiconv: For conversion of character encodings')
+	    'libiconv: For conversion of character encodings'
+)
 provides=('tvheadend')
 conflicts=('tvheadend-git')
 install=tvheadend.install
 
-source=("https://github.com/tvheadend/tvheadend/archive/v$pkgver.tar.gz" 
-	'tvheadend.service'
+source=("https://github.com/tvheadend/tvheadend/archive/v$pkgver.tar.gz"
+	"tvheadend.override"
 )
 sha256sums=('09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9'
-            'd8236359f814556d33bd0f009f2626bfbc75486de471dfa355ff1e6916e3ac58')
+            'bbb54ae46fbb1b00f987c0a8dde644ee9a0121fa173ee21cc6bf7a6a6fb12146')
  
 prepare() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr --python=python3 \
         --disable-ffmpeg_static \
         --disable-libx264_static \
@@ -36,13 +37,20 @@ prepare() {
 }
 
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make
 }
 
 package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="$pkgdir" install
-    chmod 0644 ${pkgdir}/usr/share/man/man1/tvheadend.1
-    install -D -m 644 "$srcdir/tvheadend.service" "$pkgdir/usr/lib/systemd/system/tvheadend.service"
+
+    # Fix permission mode of man-page
+    chmod 0644 "${pkgdir}/usr/share/man/man1/tvheadend.1"
+
+    # Install service file
+    install -Dm644 "rpm/tvheadend.service" "$pkgdir/usr/lib/systemd/system/tvheadend.service"
+
+    # Install service override
+    install -Dm644 "$srcdir/tvheadend.override" "$pkgdir/usr/lib/systemd/system/tvheadend.service.d/override.conf"
 }
diff --git a/tvheadend.override b/tvheadend.override
new file mode 100644
index 000000000000..b72c08eb89c8
--- /dev/null
+++ b/tvheadend.override
@@ -0,0 +1,4 @@
+[Service]
+EnvironmentFile=
+ExecStart=
+ExecStart=/usr/bin/tvheadend -f -p /var/run/tvheadend.pid -C -u hts -g video
diff --git a/tvheadend.service b/tvheadend.service
deleted file mode 100644
index 5754f27d20a0..000000000000
--- a/tvheadend.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=tvheadend
-After=tmp.mount network.target
-
-[Service]
-Type=forking
-PIDFile=/run/tvheadend.pid
-ExecStart=/usr/bin/tvheadend -f -p /run/tvheadend.pid -C -u hts -g video
-ExecStop=/usr/bin/rm /run/tvheadend.pid
-Restart=always
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target