Update to 5.3.0-2

4 files changed, 46 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3853659cfbc..2d22a95db35c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ums
 	pkgdesc = Universal Media Server: a DLNA-compliant UPnP Media Server. Build based on Java 8.
 	pkgver = 5.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.universalmediaserver.com/
 	arch = i686
 	arch = x86_64
@@ -11,11 +11,16 @@ pkgbase = ums
 	depends = ffmpeg
 	depends = mencoder
 	depends = libmediainfo
-	depends = java-runtime
+	depends = java-runtime=8
+	depends = tsmuxer-ng
 	backup = opt/ums/UMS.conf
 	backup = opt/ums/WEB.conf
 	source = http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/UMS-5.3.0-Java8.tgz
-	sha1sums = e967afcfb53813bc8f9195b3ca54c9b699c9df3b
+	source = ums.desktop
+	source = ums.service
+	sha256sums = fffd9556f8ae1418b07286ddfe234fd2198b8479259795d599fa57d723fc9948
+	sha256sums = 0cdadbabef215b6539e56755147a8f626d9f1fadfb85e2e5b7f7f1b66f1cdef9
+	sha256sums = e9709c58a909b79062604425e18e0ab7a8ee5d7b823fb481dcc9269b02fcc4a7
 
 pkgname = ums
 
diff --git a/PKGBUILD b/PKGBUILD
index 69728231a63e..836e6c2bcf2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=ums
 pkgver=5.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Universal Media Server: a DLNA-compliant UPnP Media Server. Build based on Java 8."
 arch=('i686' 'x86_64')
 url="http://www.universalmediaserver.com/"
 license=('GPL2')
-depends=('mplayer' 'ffmpeg' 'mencoder' 'libmediainfo' 'java-runtime')
+depends=('mplayer' 'ffmpeg' 'mencoder' 'libmediainfo' 'java-runtime=8' 'tsmuxer-ng')
 makedepends=("unzip")
 [ "$CARCH" = "i686" ] && \
 optdepends=("vlc: For Internet video/audio")
@@ -19,17 +19,25 @@ optdepends=("vlc: Internet video/audio support"
             "lib32-glibc: tsMuxeR support")
 backup=(opt/ums/UMS.conf \
         opt/ums/WEB.conf)
-source=("http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/UMS-$pkgver-Java8.tgz")
-sha1sums=('e967afcfb53813bc8f9195b3ca54c9b699c9df3b')
+source=("http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/UMS-$pkgver-Java8.tgz"
+        'ums.desktop'
+        'ums.service')
+sha256sums=('fffd9556f8ae1418b07286ddfe234fd2198b8479259795d599fa57d723fc9948'
+            '0cdadbabef215b6539e56755147a8f626d9f1fadfb85e2e5b7f7f1b66f1cdef9'
+            'e9709c58a909b79062604425e18e0ab7a8ee5d7b823fb481dcc9269b02fcc4a7')
 
 package() {
   mkdir -p $pkgdir/opt/ums
   mkdir $pkgdir/opt/ums/database
   mkdir -p $pkgdir/usr/bin
   chmod -R 755 $srcdir/ums-$pkgver/plugins $srcdir/ums-$pkgver/documentation
+  rm -R $srcdir/ums-$pkgver/linux/*
   cp -r $srcdir/ums-$pkgver/* $pkgdir/opt/ums/
-  chmod +x $pkgdir/opt/ums/UMS.sh \
-           $pkgdir/opt/ums/linux/tsMuxeR
+  ln -s /usr/bin/ffmpeg $pkgdir/opt/ums/linux/ffmpeg
+  ln -s /usr/bin/ffmpeg $pkgdir/opt/ums/linux/ffmpeg64
+  ln -s /usr/bin/tsMuxeR $pkgdir/opt/ums/linux/tsMuxeR
+  ln -s /usr/bin/tsMuxeR $pkgdir/opt/ums/linux/tsMuxeR-new
+  chmod +x $pkgdir/opt/ums/UMS.sh
   touch $pkgdir/opt/ums/UMS.conf
   touch $pkgdir/opt/ums/debug.log
   chgrp users $pkgdir/opt/ums/UMS.conf \
@@ -45,20 +53,6 @@ package() {
   unzip -q -u $srcdir/ums-$pkgver/ums.jar -d ums_jar
   install -d -m 755 $pkgdir/usr/share/pixmaps
   install -D -m 644 $srcdir/ums_jar/resources/images/logo.png $pkgdir/usr/share/pixmaps/ums.png
-
-  cat > ums.desktop << EoF
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Universal Media Server
-Comment=A DLNA-compliant UPnP Media Server.
-Exec=/opt/ums/UMS.sh
-Icon=ums.png
-Terminal=false
-Type=Application
-Categories=Java;Multimedia;AudioVideo;
-EoF
-
   install -D -m 644 $srcdir/ums.desktop $pkgdir/usr/share/applications/ums.desktop
-
+  install -D -m 644 $srcdir/ums.service $pkgdir/usr/lib/systemd/system/ums@.service
 }
diff --git a/ums.desktop b/ums.desktop
new file mode 100644
index 000000000000..afd666f92168
--- /dev/null
+++ b/ums.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Universal Media Server
+Comment=A DLNA-compliant UPnP Media Server.
+Exec=/opt/ums/UMS.sh
+Icon=ums.png
+Terminal=false
+Type=Application
+Categories=Java;Multimedia;AudioVideo;
diff --git a/ums.service b/ums.service
new file mode 100644
index 000000000000..1c2780193522
--- /dev/null
+++ b/ums.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Universal Media Server
+After=syslog.target network.target rpcbind.service
+
+[Service]
+User=%i
+Group=users
+WorkingDirectory=/opt/ums/
+Type=simple
+ExecStart=/opt/ums/UMS.sh
+
+[Install]
+WantedBy=multi-user.target