summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLlewelyn Trahaearn2015-07-16 11:30:50 -0700
committerLlewelyn Trahaearn2015-07-16 11:30:50 -0700
commit589b5fb5742d454ebf6393265247454ef9a04405 (patch)
tree660435a3fea2fb57c0f2a288fb14faa5a7c55e2d
parent3da20f0f595129812830ea16fc2db6c28b498147 (diff)
downloadaur-589b5fb5742d454ebf6393265247454ef9a04405.tar.gz
Pedantic beautification.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
2 files changed, 9 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b47b0d251fd3..6799fda71610 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ladish-git
pkgdesc = Session management system for JACK.
pkgver = 0.3.r147.g5fe205f
- pkgrel = 5
+ pkgrel = 6
url = https://launchpad.net/ladish
install = ladish-git.install
arch = i686
@@ -18,7 +18,7 @@ pkgbase = ladish-git
provides = lash
conflicts = ladish
conflicts = lash
- source = git://repo.or.cz/ladish.git
+ source = ladish-git::git://repo.or.cz/ladish.git
sha512sums = SKIP
pkgname = ladish-git
diff --git a/PKGBUILD b/PKGBUILD
index 20f3a3a97747..9512184e3b4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
# Maintainer: WoefulDerelict <WoefulDerelict at GMail dot com>
# Contributor: speps <speps at aur dot archlinux dot org>
-_pkgbase=ladish
-pkgname=${_pkgbase}-git
+pkgname=ladish-git
pkgver=0.3.r147.g5fe205f
-pkgrel=5
+pkgrel=6
pkgdesc="Session management system for JACK."
arch=('i686' 'x86_64')
url="https://launchpad.net/ladish"
@@ -14,11 +13,11 @@ makedepends=('git' 'python2')
provides=('ladish' 'lash')
conflicts=('ladish' 'lash')
install=${pkgname}.install
-source=("git://repo.or.cz/${_pkgbase}.git")
+source=("${pkgname}::git://repo.or.cz/ladish.git")
sha512sums=('SKIP')
pkgver() {
- cd "${srcdir}/${_pkgbase}"
+ cd "${srcdir}/${pkgname}"
( set -o pipefail
git describe --long --tags 2>/dev/null | sed 's/^ladish.//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -27,14 +26,14 @@ pkgver() {
prepare() {
_branch=master
- cd "${srcdir}/${_pkgbase}"
+ cd "${srcdir}/${pkgname}"
git checkout ${_branch}
sed -i "s|env python|&2|" ladish_control
sed -i "s|\(RELEASE = \).*|\1True|" wscript
}
build() {
- cd "${srcdir}/${_pkgbase}"
+ cd "${srcdir}/${pkgname}"
export PYTHON=/usr/bin/python2
python2 waf configure --prefix=/usr \
--enable-liblash \
@@ -43,6 +42,6 @@ build() {
}
package() {
- cd "${srcdir}/${_pkgbase}"
+ cd "${srcdir}/${pkgname}"
python2 waf install --destdir="${pkgdir}/"
}