[arch-commits] Commit in xmms2/trunk (PKGBUILD install.sh sysusers.conf tmpfiles.conf)

[Eli Schwartz]

    Date: Monday, January 8, 2018 @ 19:04:10
  Author: eschwartz
Revision: 280571

upgpkg: xmms2 0.8DrO_o.949.gca15e830-8

migrate to sysusers.d
fix git submodules cloning outside of the source downloading step

Added:
  xmms2/trunk/sysusers.conf
Modified:
  xmms2/trunk/PKGBUILD
  xmms2/trunk/tmpfiles.conf
Deleted:
  xmms2/trunk/install.sh

---------------+
 PKGBUILD      |   19 ++++++++++++++-----
 install.sh    |   10 ----------
 sysusers.conf |    2 ++
 tmpfiles.conf |    1 +
 4 files changed, 17 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-08 18:33:19 UTC (rev 280570)
+++ PKGBUILD	2018-01-08 19:04:10 UTC (rev 280571)
@@ -10,7 +10,7 @@
 pkgname=xmms2
 pkgver=0.8DrO_o.949.gca15e830
 _commit=ca15e830bd1b18e26772657b0a057cfedb91d2eb
-pkgrel=7
+pkgrel=8
 pkgdesc="X-platform Music Multiplexing System 2"
 arch=(x86_64)
 url="https://xmms2.org/"
@@ -53,13 +53,18 @@
 depends=(glib2 readline)
 makedepends=("${_depends[@]%%:*}" libpulse python2 git)
 optdepends=("${_depends[@]}" 'pulseaudio: PulseAudio output')
-install=install.sh
 source=(git://git.xmms2.org/xmms2/xmms2-devel.git#commit=${_commit}
+        git://git.xmms2.org/xmms2/xmms2-tutorial.git
+        git://git.xmms2.org/xmms2/s4.git
         tmpfiles.conf
+        sysusers.conf
         system.service
         user.service)
 sha256sums=('SKIP'
-            'fd37bd48c61bb71ec03566d740c52dcedd95a37d6c92008606ff7e76c261224f'
+            'SKIP'
+            'SKIP'
+            '13e3e2720e21d048d776156f8ab17c40d05b70437823da00b3c4cc2e7f7ecf7f'
+            'a37e35dedd48fb8fbc2c97d79be8a3d3c3b00191826f6046f730f649cd67812a'
             'a159b18c5959cfe76ca87990ff6879d082bfe9a4c6d674c493461f7f2781f348'
             '76f1a06b81cec0f5942430401998f6c8cd9cb95d798f97b854f88afd73ffe61d')
 
@@ -70,7 +75,10 @@
 
 prepare() {
     cd xmms2-devel
-    git submodule update --init
+    git submodule init
+    git config submodule.doc/tutorial.url "$srcdir"/xmms2-tutorial
+    git config submodule.src/lib/s4.url "$srcdir"/s4
+    git submodule update
     sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' src/plugins/avcodec/avcodec_compat.h
     sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c
     sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript}
@@ -91,7 +99,8 @@
 package() {
     cd xmms2-devel
     ./waf --destdir="$pkgdir" install
-    install -dm0755 "$pkgdir/var/lib/xmms2"
+    install -Dm0644 "$srcdir/sysusers.conf" \
+            "$pkgdir/usr/lib/sysusers.d/xmms2.conf"
     install -Dm0644 "$srcdir/tmpfiles.conf" \
             "$pkgdir/usr/lib/tmpfiles.d/xmms2.conf"
     install -Dm0644 "$srcdir/system.service" \

Deleted: install.sh
===================================================================
--- install.sh	2018-01-08 18:33:19 UTC (rev 280570)
+++ install.sh	2018-01-08 19:04:10 UTC (rev 280571)
@@ -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
-}

Added: sysusers.conf
===================================================================
--- sysusers.conf	                        (rev 0)
+++ sysusers.conf	2018-01-08 19:04:10 UTC (rev 280571)
@@ -0,0 +1,2 @@
+u xmms2  -      -  /var/lib/xmms2
+m xmms2  audio

Modified: tmpfiles.conf
===================================================================
--- tmpfiles.conf	2018-01-08 18:33:19 UTC (rev 280570)
+++ tmpfiles.conf	2018-01-08 19:04:10 UTC (rev 280571)
@@ -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