summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Demin2021-09-17 18:57:44 +0500
committerTimur Demin2021-09-17 18:57:44 +0500
commitad2fa68e1c02ab3b9cadfda561e18b78a18e814b (patch)
tree2643edf929796f7d9298d06c8003c5bb6a40d02a
parent11143e2424c1252c449040e8b593bbf85e9bdf7c (diff)
downloadaur-ad2fa68e1c02ab3b9cadfda561e18b78a18e814b.tar.gz
Make source non-conflicting on updates
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD10
2 files changed, 9 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 732781257d87..9f0a2b2bf40b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = airsonic-advanced-bin
pkgdesc = Free, web-based media streamer and jukebox fork
pkgver = 10.6.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/airsonic-advanced/airsonic-advanced
arch = any
license = GPL3
@@ -9,12 +9,12 @@ pkgbase = airsonic-advanced-bin
depends = ttf-dejavu
provides = airsonic
conflicts = airsonic
- noextract = airsonic.war
+ noextract = airsonic-10.6.0.war
noextract = airsonic.sysusers
noextract = airsonic.tmpfiles
backup = etc/airsonic/airsonic.conf
- 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-10.6.0.war::https://github.com/airsonic-advanced/airsonic-advanced/releases/download/v10.6.0/airsonic.war
+ source = src-10.6.0.tar.gz::https://github.com/airsonic-advanced/airsonic-advanced/archive/v10.6.0.tar.gz
source = airsonic.sysusers
source = airsonic.tmpfiles
sha256sums = 528f417e59499161ad7fd8b86d391e3c7eff70e0825465e315f86d3417664c69
@@ -23,4 +23,3 @@ pkgbase = airsonic-advanced-bin
sha256sums = 952c15c8c6b53b9c63a96eb6b2402eae42bde56dc9c6c60484cf039a03a82963
pkgname = airsonic-advanced-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index 79d063cd5cb5..ab9d8fdf57b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=airsonic-advanced-bin
pkgver=10.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="Free, web-based media streamer and jukebox fork"
arch=('any')
url="https://github.com/airsonic-advanced/airsonic-advanced"
@@ -12,9 +12,9 @@ depends=('java-runtime-headless' 'ttf-dejavu')
provides=(airsonic)
conflicts=(airsonic)
backup=('etc/airsonic/airsonic.conf')
-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
+noextract=(airsonic-${pkgver}.war airsonic.sysusers airsonic.tmpfiles)
+source=(airsonic-${pkgver}.war::${url}/releases/download/v${pkgver}/airsonic.war
+ src-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz
airsonic.sysusers
airsonic.tmpfiles)
@@ -35,7 +35,7 @@ package() {
install -dm755 "${pkgdir}/etc/airsonic"
install -Dm644 \
- "${srcdir}/airsonic.war" \
+ "${srcdir}/airsonic-${pkgver}.war" \
"${pkgdir}/var/lib/airsonic/airsonic.war"
install -Dm644 \
"${srcdir}/${_dirname}/contrib/airsonic-systemd-env" \