Package tuning.

2 files changed, 20 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8b7cc34ec06..34a66d4fce0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 pkgbase = ladish-git
 	pkgdesc = Session management system for JACK.
 	pkgver = 0.3.r147.g5fe205f
-	pkgrel = 4
+	pkgrel = 1
 	url = https://launchpad.net/ladish
 	install = ladish-git.install
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = GPL2
 	makedepends = git
 	makedepends = python2
-	depends = jack2-dbus
+	depends = jack
 	depends = dbus-glib
 	depends = laditools-git
 	depends = flowcanvas<=0.7.1
diff --git a/PKGBUILD b/PKGBUILD
index f5d8ee51f8ab..f065df9220de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,40 @@
 # Maintainer: WoefulDerelict <WoefulDerelict at GMail dot com>
 # Contributor: speps <speps at aur dot archlinux dot org>
-pkgname=ladish-git
+
+_pkgbase=ladish
+pkgname=${_pkgbase}-git
 pkgver=0.3.r147.g5fe205f
-pkgrel=4
+pkgrel=1
 pkgdesc="Session management system for JACK."
-arch=('any')
+arch=('i686' 'x86_64')
 url="https://launchpad.net/ladish"
 license=('GPL2')
-depends=('jack2-dbus' 'dbus-glib' 'laditools-git' 'flowcanvas<=0.7.1' 'a2jmidid')
+depends=('jack' 'dbus-glib' 'laditools-git' 'flowcanvas<=0.7.1' 'a2jmidid')
 makedepends=('git' 'python2')
-provides=("ladish" "lash")
-conflicts=("ladish" "lash")
+provides=('ladish' 'lash')
+conflicts=('ladish' 'lash')
 install=${pkgname}.install
-source=("git://repo.or.cz/ladish.git")
+source=("git://repo.or.cz/${_pkgbase}.git")
 sha512sums=('SKIP')
 
 pkgver() {
-  cd ${srcdir}/ladish
+  cd "${srcdir}/${_pkgbase}"
   ( set -o pipefail
-    git describe --long --tags 2>/dev/null | sed 's/^ladish-//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
+    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)"
   )
 }
 
 prepare() {
-  cd "${srcdir}/ladish"
-  git checkout master
+  _branch=master
+  cd "${srcdir}/${_pkgbase}"
+  git checkout ${_branch}
   sed -i "s|env python|&2|" ladish_control
   sed -i "s|\(RELEASE = \).*|\1True|" wscript
 }
 
 build() {
-  cd "${srcdir}/ladish"
+  cd "${srcdir}/${_pkgbase}"
   export PYTHON=/usr/bin/python2
   python2 waf configure --prefix=/usr \
                         --enable-liblash \
@@ -40,6 +43,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/ladish"
+  cd "${srcdir}/${_pkgbase}"
   python2 waf install --destdir="${pkgdir}/"
 }