Update to v10.4.1. Switch back to upstream service file.

2 files changed, 25 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e93aede3c8c..c44952993126 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = airsonic
 	pkgdesc = A free, web-based media streamer and jukebox.
-	pkgver = 10.4.0
+	pkgver = 10.4.1
 	pkgrel = 1
 	url = https://github.com/Airsonic/airsonic/
 	arch = any
@@ -8,14 +8,14 @@ pkgbase = airsonic
 	depends = java-runtime-headless
 	noextract = airsonic.war
 	backup = etc/airsonic/airsonic.conf
-	source = https://github.com/airsonic/airsonic/releases/download/v10.4.0/airsonic.war
-	source = https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic-systemd-env
-	source = airsonic.service
+	source = airsonic-10.4.1.war::https://github.com/airsonic/airsonic/releases/download/v10.4.1/airsonic.war
+	source = airsonic-systemd-env-10.4.1::https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic-systemd-env
+	source = airsonic-10.4.1.service::https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic.service
 	source = airsonic.sysusers
 	source = airsonic.tmpfiles
-	sha256sums = 0842a1fc4380cbe75e40dcb94e40332222b816514bd8ad250501d472210894d4
+	sha256sums = 1d3ee9811ecbabbf9e2cfb63bd936bc238fe75dbcd223a87f3fab18b7a2a75a3
 	sha256sums = 059a43fe100d95aaaae8091d1c312f4d3a2a2b4edc1969358dd7be35f6525930
-	sha256sums = 8178ae5396921739176e33ae8693d0fe5fb43709fc669e38cc87ab0d0e8bf2fb
+	sha256sums = 21deabc2802a3909c040451c60a3fdf4ee157a3e05b5b9bafa164bc12ce9c0b2
 	sha256sums = 25af0b92b247df928db5ac8fec3fb4fa2cdc717e649729d5e0c059a5b81e058e
 	sha256sums = 952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963
 
diff --git a/PKGBUILD b/PKGBUILD
index 9e8f874d5473..dbc925a078ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Federico Giuliani <federico.giuliani86 at gmail dot com>
 
 pkgname=airsonic
-pkgver=10.4.0
+pkgver=10.4.1
 pkgrel=1
 pkgdesc="A free, web-based media streamer and jukebox."
 arch=('any')
@@ -9,34 +9,35 @@ url="https://github.com/Airsonic/airsonic/"
 license=('GPL3')
 depends=('java-runtime-headless')
 backup=('etc/airsonic/airsonic.conf')
-noextract=(airsonic.war)
-source=(https://github.com/airsonic/airsonic/releases/download/v${pkgver}/airsonic.war
-        https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/airsonic-systemd-env
-        "${pkgname}.service"
-        "${pkgname}.sysusers"
-        "${pkgname}.tmpfiles")
+noextract=(${pkgname}.war)
+source=(${pkgname}-${pkgver}.war::https://github.com/airsonic/airsonic/releases/download/v${pkgver}/${pkgname}.war
+        ${pkgname}-systemd-env-${pkgver}::https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/${pkgname}-systemd-env
+        ${pkgname}-${pkgver}.service::https://raw.githubusercontent.com/airsonic/airsonic/master/contrib/${pkgname}.service
+        ${pkgname}.sysusers
+        ${pkgname}.tmpfiles)
 
 package() {
   cd ${srcdir}
-  mkdir -p ${pkgdir}/var/lib/airsonic
-  mkdir -p ${pkgdir}/var/lib/airsonic/playlists
+  mkdir -p ${pkgdir}/var/lib/${pkgname}
+  mkdir -p ${pkgdir}/var/lib/${pkgname}/playlists
   mkdir -p ${pkgdir}/usr/lib/systemd/system
-  mkdir -p ${pkgdir}/etc/airsonic
-  cp airsonic.war ${pkgdir}/var/lib/airsonic
+  mkdir -p ${pkgdir}/etc/${pkgname}
+  cp ${pkgname}-${pkgver}.war ${pkgdir}/var/lib/${pkgname}/${pkgname}.war
+  
+  sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' ${pkgname}-${pkgver}.service
+  sed -i 's/\/etc\/sysconfig\/airsonic/\/etc\/airsonic\/airsonic.conf/' ${pkgname}-${pkgver}.service
 
-  sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' airsonic-systemd-env  
-  cp airsonic-systemd-env ${pkgdir}/etc/airsonic/airsonic.conf
+  sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' ${pkgname}-systemd-env-${pkgver}  
+  cp ${pkgname}-systemd-env-${pkgver} ${pkgdir}/etc/${pkgname}/${pkgname}.conf
   
-  install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
   install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
   
 }
 
-sha256sums=('0842a1fc4380cbe75e40dcb94e40332222b816514bd8ad250501d472210894d4'
+sha256sums=('1d3ee9811ecbabbf9e2cfb63bd936bc238fe75dbcd223a87f3fab18b7a2a75a3'
             '059a43fe100d95aaaae8091d1c312f4d3a2a2b4edc1969358dd7be35f6525930'
-            '8178ae5396921739176e33ae8693d0fe5fb43709fc669e38cc87ab0d0e8bf2fb'
+            '21deabc2802a3909c040451c60a3fdf4ee157a3e05b5b9bafa164bc12ce9c0b2'
             '25af0b92b247df928db5ac8fec3fb4fa2cdc717e649729d5e0c059a5b81e058e'
             '952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963')
-
-