Switch to airsonic-advanced

This fixes the PKGBUILD to use airsonic-advanced as its upstream. Aside
from that, it also makes the PKGBUILD actually follow the packaging
guidelines.

2 files changed, 58 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbb3c21c24f7..732781257d87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
-pkgbase = airsonic
-	pkgdesc = A free, web-based media streamer and jukebox.
-	pkgver = 10.6.2
+pkgbase = airsonic-advanced-bin
+	pkgdesc = Free, web-based media streamer and jukebox fork
+	pkgver = 10.6.0
 	pkgrel = 1
-	url = https://github.com/Airsonic/airsonic/
+	url = https://github.com/airsonic-advanced/airsonic-advanced
 	arch = any
 	license = GPL3
 	depends = java-runtime-headless
 	depends = ttf-dejavu
+	provides = airsonic
+	conflicts = airsonic
 	noextract = airsonic.war
+	noextract = airsonic.sysusers
+	noextract = airsonic.tmpfiles
 	backup = etc/airsonic/airsonic.conf
-	source = airsonic-10.6.2.war::https://github.com/airsonic/airsonic/releases/download/v10.6.2/airsonic.war
-	source = airsonic-systemd-env-10.6::https://raw.githubusercontent.com/airsonic/airsonic/release-10.6/contrib/airsonic-systemd-env
-	source = airsonic-10.6.service::https://raw.githubusercontent.com/airsonic/airsonic/release-10.6/contrib/airsonic.service
+	source = airsonic.war::https://github.com/airsonic-advanced/airsonic-advanced/releases/download/v10.6.0/airsonic.war
+	source = src.tar.gz::https://github.com/airsonic-advanced/airsonic-advanced/archive/v10.6.0.tar.gz
 	source = airsonic.sysusers
 	source = airsonic.tmpfiles
-	sha256sums = 94b17d6a7859a9c029dcbcdc672f4d49bd605bf46bdf74ac51ea0d593db67860
-	sha256sums = 059a43fe100d95aaaae8091d1c312f4d3a2a2b4edc1969358dd7be35f6525930
-	sha256sums = 6f2e626e393d1e706e3edb45d5dfabf026d9360016d0c2643430c4503dc3e9e2
+	sha256sums = 528f417e59499161ad7fd8b86d391e3c7eff70e0825465e315f86d3417664c69
+	sha256sums = 00697cbb42ce4742098bfad27795fbf91093698dcff00070724e39c3c36ddee2
 	sha256sums = 25af0b92b247df928db5ac8fec3fb4fa2cdc717e649729d5e0c059a5b81e058e
 	sha256sums = 952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963
 
-pkgname = airsonic
+pkgname = airsonic-advanced-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 69f822083026..79d063cd5cb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,57 @@
-# Maintainer: Federico Giuliani <federico.giuliani86 at gmail dot com>
+# Maintainer: Timur Demin <me@tdem.in>
+# Contributor: Federico Giuliani <federico.giuliani86 at gmail dot com>
 
-pkgname=airsonic
-pkgver=10.6.2
-_relver=10.6
+pkgname=airsonic-advanced-bin
+pkgver=10.6.0
 pkgrel=1
-pkgdesc="A free, web-based media streamer and jukebox."
+pkgdesc="Free, web-based media streamer and jukebox fork"
 arch=('any')
-url="https://github.com/Airsonic/airsonic/"
+url="https://github.com/airsonic-advanced/airsonic-advanced"
 license=('GPL3')
 depends=('java-runtime-headless' 'ttf-dejavu')
+provides=(airsonic)
+conflicts=(airsonic)
 backup=('etc/airsonic/airsonic.conf')
-noextract=(${pkgname}.war)
-source=(${pkgname}-${pkgver}.war::https://github.com/airsonic/airsonic/releases/download/v${pkgver}/${pkgname}.war
-        ${pkgname}-systemd-env-${_relver}::https://raw.githubusercontent.com/airsonic/airsonic/release-${_relver}/contrib/${pkgname}-systemd-env
-        ${pkgname}-${_relver}.service::https://raw.githubusercontent.com/airsonic/airsonic/release-${_relver}/contrib/${pkgname}.service
-        ${pkgname}.sysusers
-        ${pkgname}.tmpfiles)
+noextract=(airsonic.war airsonic.sysusers airsonic.tmpfiles)
+source=(airsonic.war::${url}/releases/download/v${pkgver}/airsonic.war
+        src.tar.gz::${url}/archive/v${pkgver}.tar.gz
+        airsonic.sysusers
+        airsonic.tmpfiles)
+
+_dirname=airsonic-advanced-${pkgver}
+
+prepare() {
+    sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' \
+        "${srcdir}/${_dirname}/contrib/airsonic.service" \
+        "${srcdir}/${_dirname}/contrib/airsonic-systemd-env"
+    sed -i 's/\/etc\/sysconfig\/airsonic/\/etc\/airsonic\/airsonic.conf/' \
+        "${srcdir}/${_dirname}/contrib/airsonic.service"
+}
 
 package() {
-  cd ${srcdir}
-  mkdir -p ${pkgdir}/var/lib/${pkgname}
-  mkdir -p ${pkgdir}/var/lib/${pkgname}/playlists
-  mkdir -p ${pkgdir}/usr/lib/systemd/system
-  mkdir -p ${pkgdir}/etc/${pkgname}
-  cp ${pkgname}-${pkgver}.war ${pkgdir}/var/lib/${pkgname}/${pkgname}.war
-  
-  sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' ${pkgname}-${_relver}.service
-  sed -i 's/\/etc\/sysconfig\/airsonic/\/etc\/airsonic\/airsonic.conf/' ${pkgname}-${_relver}.service
+    install -dm755 "${pkgdir}/var/lib/airsonic"
+    install -dm755 "${pkgdir}/var/lib/airsonic/playlists"
+    install -dm755 "${pkgdir}/usr/lib/systemd/system"
+    install -dm755 "${pkgdir}/etc/airsonic"
 
-  sed -i 's/\/var\/airsonic/\/var\/lib\/airsonic/' ${pkgname}-systemd-env-${_relver}  
-  cp ${pkgname}-systemd-env-${_relver} ${pkgdir}/etc/${pkgname}/${pkgname}.conf
-  
-  install -Dm644 "${srcdir}/${pkgname}-${_relver}.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"
-  
+    install -Dm644 \
+        "${srcdir}/airsonic.war" \
+        "${pkgdir}/var/lib/airsonic/airsonic.war"
+    install -Dm644 \
+        "${srcdir}/${_dirname}/contrib/airsonic-systemd-env" \
+        "${pkgdir}/etc/airsonic/airsonic.conf" 
+    install -Dm644 \
+        "${srcdir}/${_dirname}/contrib/airsonic.service" \
+        "${pkgdir}/usr/lib/systemd/system/airsonic.service"
+    install -Dm644 \
+        "${srcdir}/airsonic.sysusers" \
+        "${pkgdir}/usr/lib/sysusers.d/airsonic.conf"
+    install -Dm644 \
+        "${srcdir}/airsonic.tmpfiles" \
+        "${pkgdir}/usr/lib/tmpfiles.d/airsonic.conf" 
 }
-sha256sums=('94b17d6a7859a9c029dcbcdc672f4d49bd605bf46bdf74ac51ea0d593db67860'
-            '059a43fe100d95aaaae8091d1c312f4d3a2a2b4edc1969358dd7be35f6525930'
-            '6f2e626e393d1e706e3edb45d5dfabf026d9360016d0c2643430c4503dc3e9e2'
+
+sha256sums=('528f417e59499161ad7fd8b86d391e3c7eff70e0825465e315f86d3417664c69'
+            '00697cbb42ce4742098bfad27795fbf91093698dcff00070724e39c3c36ddee2'
             '25af0b92b247df928db5ac8fec3fb4fa2cdc717e649729d5e0c059a5b81e058e'
             '952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963')
-