diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 7aa5ad2..0f3f752 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -10,7 +10,7 @@ pkgname=xmms2 pkgver=0.8DrO_o.949.gca15e830 _commit=ca15e830bd1b18e26772657b0a057cfedb91d2eb -pkgrel=5 +pkgrel=6 pkgdesc="X-platform Music Multiplexing System 2" arch=(i686 x86_64) url="https://xmms2.org/" @@ -55,13 +55,14 @@ makedepends=("${_depends[@]%%:*}" libpulse python2 git) optdepends=("${_depends[@]}" 'oss: OSS output' 'pulseaudio: PulseAudio output') provides=(xmms2) conflicts=(xmms2 xmms2-devel) -install=install.sh source=(git://git.xmms2.org/xmms2/xmms2-devel.git#commit=${_commit} tmpfiles.conf + sysusers.conf system.service user.service) md5sums=('SKIP' - 'd3ab09ed8d1cf982468d1ceb141d4a9d' + 'e737e9090d326a01bc291e5ac1c08ac7' + '5bd389a3074426d2a1abd5b4dbad58c4' '4b026ab80e853f24b5cf13b310afb83c' 'f773f674882946065c02e36e9548eb00') @@ -96,6 +97,8 @@ package() { install -dm0755 "$pkgdir/var/lib/xmms2" install -Dm0644 "$srcdir/tmpfiles.conf" \ "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf" + install -D -m644 "$srcdir"/sysusers.conf \ + "$pkgdir/usr/lib/sysusers.d/xmms2.conf" install -Dm0644 "$srcdir/system.service" \ "$pkgdir/usr/lib/systemd/system/xmms2d.service" install -Dm0644 "$srcdir/user.service" \ diff --git a/trunk/install.sh b/trunk/install.sh deleted file mode 100644 index dac4ecb..0000000 --- a/trunk/install.sh +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - getent group xmms2 > /dev/null || groupadd -r xmms2 - getent passwd xmms2 > /dev/null || useradd -r -g xmms2 -d /var/lib/xmms2 -s /bin/false -G audio xmms2 - chown -R xmms2:xmms2 var/lib/xmms2 - true -} - -post_upgrade() { - post_install -} diff --git a/trunk/sysusers.conf b/trunk/sysusers.conf new file mode 100644 index 0000000..3c65549 --- /dev/null +++ b/trunk/sysusers.conf @@ -0,0 +1,2 @@ +u xmms2 - - /var/lib/xmms2 +m xmss2 audio diff --git a/trunk/tmpfiles.conf b/trunk/tmpfiles.conf index 61cd6a7..eec94de 100644 --- a/trunk/tmpfiles.conf +++ b/trunk/tmpfiles.conf @@ -1,2 +1,3 @@ d /run/xmms2 0755 xmms2 xmms2 +d /var/lib/xmms2 0755 xmms2 xmms2 f /var/log/xmms2d.log 0644 xmms2 xmms2