diff options
-rw-r--r-- | .SRCINFO | 13 | ||||
-rw-r--r-- | PKGBUILD | 61 | ||||
-rw-r--r-- | mopidy.conf | 2 | ||||
-rwxr-xr-x | mopidy.rc | 43 | ||||
-rw-r--r-- | mopidy@.service | 11 |
5 files changed, 45 insertions, 85 deletions
@@ -1,6 +1,6 @@ pkgbase = mopidy-git pkgdesc = A music server which can play music from Spotify - pkgver = 20130430 + pkgver = 20130807 pkgrel = 1 url = http://www.mopidy.com arch = any @@ -15,18 +15,17 @@ pkgbase = mopidy-git depends = gstreamer0.10-python depends = gstreamer0.10-base-plugins depends = gstreamer0.10-good-plugins + depends = gstreamer0.10-ugly-plugins optdepends = python2-cherrypy: HTTP frontend optdepends = python2-ws4py: HTTP frontend optdepends = python2-pylast: Last.fm frontend optdepends = python2-dbus: MPRIS frontend provides = mopidy conflicts = mopidy - options = !emptydirs - backup = etc/conf.d/mopidy - source = mopidy.rc - source = mopidy.conf - md5sums = d6e683e985056dcabc4bade0582099ff - md5sums = d4d6d67d6e1cee1a686d2f2443f2cb6d + source = git://github.com/mopidy/mopidy.git#branch=master + source = mopidy@.service + md5sums = SKIP + md5sums = eee7b58b4eb5ca7de27f67e174ab7f9a pkgname = mopidy-git @@ -1,55 +1,50 @@ # Maintainer: Trygve Aaberge <trygveaa+aur at gmail dot com> pkgname=mopidy-git -pkgver=20130430 +_gitname=mopidy +pkgver=20130807 pkgrel=1 pkgdesc="A music server which can play music from Spotify" -arch=(any) +arch=('any') url="http://www.mopidy.com" license=('APACHE') -depends=('python2' 'pyspotify-git' 'python2-pykka' 'python2-distribute' 'gawk' 'gstreamer0.10-python' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins') -makedepends=('git' 'python2') +depends=('python2' + 'pyspotify-git' + 'python2-pykka' + 'python2-distribute' + 'gawk' + 'gstreamer0.10-python' + 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' + 'gstreamer0.10-ugly-plugins') +makedepends=('git' + 'python2') optdepends=('python2-cherrypy: HTTP frontend' 'python2-ws4py: HTTP frontend' 'python2-pylast: Last.fm frontend' 'python2-dbus: MPRIS frontend') -provides=('mopidy') conflicts=('mopidy') -options=(!emptydirs) -backup=('etc/conf.d/mopidy') -source=('mopidy.rc' 'mopidy.conf') -md5sums=('d6e683e985056dcabc4bade0582099ff' - 'd4d6d67d6e1cee1a686d2f2443f2cb6d') - -_gitroot="git://github.com/mopidy/mopidy.git" -_gitname="mopidy" +provides=('mopidy') +source=('git://github.com/mopidy/mopidy.git#branch=master' + 'mopidy@.service') +md5sums=('SKIP' + 'eee7b58b4eb5ca7de27f67e174ab7f9a') + +pkgver() { + cd $_gitname + git describe --always | sed 's|-|.|g' +} build() { - cd "$srcdir" - msg "Connecting to GIT server..." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin master - msg "The local files are updated." - else - git clone --depth=1 -b master $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - - cd "$srcdir/$_gitname" - git clean -fdx - - msg "Starting make..." + cd $_gitname python2 setup.py build } package() { - cd "$srcdir/$_gitname" - python2 setup.py install --prefix=/usr --root=$pkgdir/ --optimize=1 + cd $_gitname + python2 setup.py install --prefix=/usr --root="$pkgdir/" --optimize=1 - install -Dm755 "$srcdir/mopidy.rc" "$pkgdir/etc/rc.d/mopidy" - install -Dm644 "$srcdir/mopidy.conf" "$pkgdir/etc/conf.d/mopidy" + install -Dm644 "$srcdir/mopidy@.service" "$pkgdir/usr/lib/systemd/system/mopidy@.service" install -Dm644 "$srcdir/$_gitname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/mopidy.conf b/mopidy.conf deleted file mode 100644 index 08bca29942a1..000000000000 --- a/mopidy.conf +++ /dev/null @@ -1,2 +0,0 @@ -# The user that mopidy should run as. -# MOPIDY_USER="" diff --git a/mopidy.rc b/mopidy.rc deleted file mode 100755 index bbb9dd1cc678..000000000000 --- a/mopidy.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/mopidy - -PID=`ps -A -F | grep -v grep | grep "/usr/bin/python2 /usr/bin/mopidy" | awk '{print $2}'` - -case "$1" in - start) - stat_busy "Starting Mopidy" - if [ -z "$MOPIDY_USER" ]; then - stat_busy "No MOPIDY_USER, please edit /etc/conf.d/mopidy" - stat_fail - else - [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/mopidy &> /dev/null &" "$MOPIDY_USER" - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mopidy - stat_done - fi - fi - ;; - stop) - stat_busy "Stopping Mopidy" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mopidy - stat_done - fi - ;; - restart) - $0 stop - while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/mopidy@.service b/mopidy@.service new file mode 100644 index 000000000000..912ba3ff4873 --- /dev/null +++ b/mopidy@.service @@ -0,0 +1,11 @@ +[Unit] +Description=mopidy +After=network.target + +[Service] +Type=simple +User=%I +ExecStart=/usr/bin/mopidy + +[Install] +WantedBy=multi-user.target |