summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gregoratto2018-02-10 01:52:38 +1100
committerStephen Gregoratto2018-02-10 01:52:38 +1100
commit4d99acbfb7357118a51bc816f625e71b3129a5e4 (patch)
tree767c4558b7eae6bb3ffced4f3b73c3adca616ed1
parent69202582fb2e5b3c29a1af085b79730dea02d5a9 (diff)
downloadaur-4d99acbfb7357118a51bc816f625e71b3129a5e4.tar.gz
Replace provides w/ conflicts, better version retrieval
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57592d03909..38eae332de9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,7 @@ pkgbase = adlmidi-git
license = GPL2+
makedepends = git
optdepends = ffmpeg: recording output to video file
- provides = adlmidi
+ conflicts = adlmidi
source = git://bisqwit.iki.fi/adlmidi.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 563034e494c..b8c76c74ffe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Stephen Gregoratto <themanhimself@sgregoratto.me>
-pkgname="adlmidi-git"
+pkgname=adlmidi-git
pkgdesc="Commandline program that plays MIDI via software OPL3 emulation"
pkgrel=1
pkgver=1.2.6
@@ -9,13 +9,13 @@ url="https://bisqwit.iki.fi/source/adlmidi.html"
license=('GPL3' 'GPL2+')
makedepends=('git')
optdepends=('ffmpeg: recording output to video file')
-provides=(adlmidi)
+conflicts=(adlmidi)
source=("git://bisqwit.iki.fi/adlmidi.git")
sha256sums=('SKIP')
pkgver() {
cd "${pkgname/-git}"
- printf "%s" "$(git describe origin/release)"
+ git describe --long --tags origin/release | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
}
build() {