updated on Sun Feb 10 20:00:04 UTC 2013

2 files changed, 34 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 252337d931bf..bf180e5e0df9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,23 @@
 pkgbase = mopidy-git
 	pkgdesc = A music server which can play music from Spotify
-	pkgver = 20120219
+	pkgver = 20130210
 	pkgrel = 1
 	url = http://www.mopidy.com
 	arch = any
 	license = APACHE
+	makedepends = git
 	makedepends = python2
 	depends = python2
-	depends = gstreamer0.10-python
 	depends = pyspotify-git
-	depends = gawk
 	depends = python2-pykka
+	depends = gawk
+	depends = gstreamer0.10-python
 	depends = gstreamer0.10-base-plugins
 	depends = gstreamer0.10-good-plugins
+	optdepends = python2-cherrypy: HTTP frontend
+	optdepends = python2-ws4py: HTTP frontend
+	optdepends = python2-pylast: Last.fm frontend
+	optdepends = python2-dbus: D-Bus frontent
 	provides = mopidy
 	conflicts = mopidy
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 7dbb4cb6fbea..02bf2648dded 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,23 @@
-# Maintainer: Rickard Nilsson <rickard.nilsson@telia.com>
+# Maintainer: Trygve Aaberge <trygveaa+aur at gmail dot com>
 
 pkgname=mopidy-git
-pkgver=20120219
+pkgver=20130210
 pkgrel=1
 pkgdesc="A music server which can play music from Spotify"
 arch=(any)
 url="http://www.mopidy.com"
 license=('APACHE')
-depends=('python2' 'gstreamer0.10-python' 'pyspotify-git' 'gawk' 'python2-pykka' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins')
-makedepends=('python2')
-source=('mopidy.rc' 'mopidy.conf')
+depends=('python2' 'pyspotify-git' 'python2-pykka' 'gawk' 'gstreamer0.10-python' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins')
+makedepends=('git' 'python2')
+optdepends=('python2-cherrypy: HTTP frontend'
+            'python2-ws4py: HTTP frontend'
+            'python2-pylast: Last.fm frontend'
+            'python2-dbus: D-Bus frontent')
 provides=('mopidy')
 conflicts=('mopidy')
 options=(!emptydirs)
 backup=('etc/conf.d/mopidy')
+source=('mopidy.rc' 'mopidy.conf')
 md5sums=('d6e683e985056dcabc4bade0582099ff'
          'd4d6d67d6e1cee1a686d2f2443f2cb6d')
 
@@ -22,24 +26,31 @@ _gitname="mopidy"
 
 build() {
   cd "$srcdir"
-  msg "Connecting to GIT server...."
+  msg "Connecting to GIT server..."
 
   if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
+    cd $_gitname && git pull origin master
     msg "The local files are updated."
   else
-    git clone $_gitroot $_gitname
+    git clone --depth=1 -b master $_gitroot $_gitname
   fi
 
   msg "GIT checkout done or server timeout"
-  msg "Starting make..."
 
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
+  cd "$srcdir/$_gitname"
+  git clean -fdx
 
-  python2 setup.py install --root=$pkgdir/ --optimize=1
+  msg "Starting make..."
+  python2 setup.py build
+}
+
+package() {
+  cd "$srcdir/$_gitname"
+  python2 setup.py install --prefix=/usr --root=$pkgdir/ --optimize=1
 
-  install -D -m755 "${srcdir}/mopidy.rc" "${pkgdir}/etc/rc.d/mopidy"
-  install -D -m644 "${srcdir}/mopidy.conf" "${pkgdir}/etc/conf.d/mopidy"
+  install -Dm755 "$srcdir/mopidy.rc" "$pkgdir/etc/rc.d/mopidy"
+  install -Dm644 "$srcdir/mopidy.conf" "$pkgdir/etc/conf.d/mopidy"
+  install -Dm644 "$srcdir/$_gitname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+# vim:set ts=2 sw=2 et: