[arch-commits] Commit in lxdm/trunk (PKGBUILD lxdm.install)

[Balló György]

    Date: Tuesday, January 9, 2018 @ 20:10:53
  Author: bgyorgy
Revision: 280757

upgpkg: lxdm 0.5.3-5

Switch to systemd-sysusers

Modified:
  lxdm/trunk/PKGBUILD
Deleted:
  lxdm/trunk/lxdm.install

--------------+
 PKGBUILD     |   20 +++++++++++++++-----
 lxdm.install |   12 ------------
 2 files changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-09 20:10:11 UTC (rev 280756)
+++ PKGBUILD	2018-01-09 20:10:53 UTC (rev 280757)
@@ -7,16 +7,14 @@
 pkgbase=lxdm
 pkgname=(lxdm lxdm-gtk3)
 pkgver=0.5.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight X11 Display Manager'
 arch=('x86_64')
-url="http://lxde.org/"
+url="https://lxde.org/"
 license=('GPL')
 depends=('gtk2' 'gtk3' 'xorg-server')
 makedepends=('intltool' 'iso-codes')
-optdepends=('iso-codes: show language names in language chooser'
-            'librsvg: display the default background')
-install=$pkgbase.install
+optdepends=('iso-codes: show language names in language chooser')
 backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
         'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
         'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
@@ -43,6 +41,8 @@
   # Use our custom pam and Xsession files
   cp ../lxdm.pam pam/lxdm
   cp ../Xsession data/Xsession
+
+  autoreconf -fi
 }
 
 build() {
@@ -70,6 +70,11 @@
   cd gtk2
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Setup system user and group
+  install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
+  echo 'u lxdm - "Lightweight X11 Display Manager" /var/lib/lxdm' > "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf"
+  echo 'd /var/lib/lxdm 0700 lxdm lxdm - -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf"
 }
 
 package_lxdm-gtk3() {
@@ -81,4 +86,9 @@
   cd gtk3
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
+
+  # Setup system user and group
+  install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
+  echo 'u lxdm - "Lightweight X11 Display Manager" /var/lib/lxdm' > "$pkgdir/usr/lib/sysusers.d/$pkgbase.conf"
+  echo 'd /var/lib/lxdm 0700 lxdm lxdm - -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgbase.conf"
 }

Deleted: lxdm.install
===================================================================
--- lxdm.install	2018-01-09 20:10:11 UTC (rev 280756)
+++ lxdm.install	2018-01-09 20:10:53 UTC (rev 280757)
@@ -1,12 +0,0 @@
-post_install() {
-  getent passwd lxdm > /dev/null 2>&1 && \
-    usermod -L -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
-    useradd -rM -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s /sbin/nologin lxdm
-  mkdir -p /var/lib/lxdm
-  chown lxdm:lxdm /var/lib/lxdm
-  chmod 700 /var/lib/lxdm
-}
-
-post_upgrade() {
-  post_install
-}