diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
| commit | 8b9ddc7fec12ba69e50ece961525c90bed96df99 (patch) | |
| tree | fc12914f9d27317b3d3f1df6f0009f02ebb7668a /extra/mpd | |
| parent | 40134114ddb57a36863a256ffdc5b65a8edb5a67 (diff) | |
| parent | d915cad658736d96368750201c34df752048751a (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/perl-berkeleydb/PKGBUILD
community/egoboo/PKGBUILD
community/kdenlive/PKGBUILD
community/postgis/PKGBUILD
core/lvm2/PKGBUILD
extra/gvfs/PKGBUILD
extra/libatasmart/PKGBUILD
extra/mesa/PKGBUILD
extra/pixman/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/system-config-printer/PKGBUILD
extra/xorg-server/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/imagemagick/PKGBUILD
testing/php/PKGBUILD
testing/php/logrotate.d.php-fpm
testing/php/php-fpm.conf.in.patch
testing/php/rc.d.php-fpm
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/mpd')
| -rw-r--r-- | extra/mpd/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/mpd/install | 5 | ||||
| -rwxr-xr-x | extra/mpd/rc.d | 2 | ||||
| -rw-r--r-- | extra/mpd/tmpfiles.d | 1 |
4 files changed, 12 insertions, 8 deletions
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index c5a3bf122..dc5512c83 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155966 2012-04-10 09:35:44Z bisson $ +# $Id: PKGBUILD 160342 2012-06-01 11:41:45Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mpd pkgver=0.16.8 -pkgrel=2 +pkgrel=3 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' license=('GPL') @@ -17,10 +17,13 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f 'libpulse') makedepends=('doxygen') source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" + 'tmpfiles.d' 'rc.d') sha1sums=('977c80db8dc64e65c2bc523f69a9a7a71adca2b1' - '3777bdb4fff4b7911be3b1242aabae9d2912ef18') + 'f4d5922abb69abb739542d8e93f4dfd748acdad7' + '3470d489565f0ed479f1665dd2876f66acb5a585') +backup=('etc/mpd.conf') install=install build() { @@ -57,5 +60,6 @@ package() { install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/usr/share/mpd/mpd.conf.example + install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf } diff --git a/extra/mpd/install b/extra/mpd/install index 655645716..261b8fd0d 100644 --- a/extra/mpd/install +++ b/extra/mpd/install @@ -1,10 +1,11 @@ post_install() { getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null - getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/true -G audio mpd >/dev/null - echo '==> Now create a /etc/mpd.conf file; see: /usr/share/mpd/mpd.conf.example' + getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null + true } post_remove() { getent passwd mpd &>/dev/null && userdel mpd >/dev/null getent group mpd &>/dev/null && groupdel mpd >/dev/null + true } diff --git a/extra/mpd/rc.d b/extra/mpd/rc.d index 86f77419f..f00e16067 100755 --- a/extra/mpd/rc.d +++ b/extra/mpd/rc.d @@ -3,8 +3,6 @@ . /etc/rc.conf . /etc/rc.d/functions -[[ -d /run/mpd ]] || install -d -g mpd -o mpd /run/mpd - case "$1" in start) stat_busy 'Starting Music Player Daemon' diff --git a/extra/mpd/tmpfiles.d b/extra/mpd/tmpfiles.d new file mode 100644 index 000000000..41c4e743a --- /dev/null +++ b/extra/mpd/tmpfiles.d @@ -0,0 +1 @@ +d /run/mpd 0755 mpd mpd |