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

[Jan Steffens]

    Date: Thursday, July 28, 2016 @ 18:30:06
  Author: heftig
Revision: 272634

3.20.1-2

Modified:
  gdm/trunk/PKGBUILD
  gdm/trunk/gdm.install
Deleted:
  gdm/trunk/libgdm.install

----------------+
 PKGBUILD       |   18 ++++++++++--------
 gdm.install    |   21 ++++-----------------
 libgdm.install |   11 -----------
 3 files changed, 14 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-28 18:27:23 UTC (rev 272633)
+++ PKGBUILD	2016-07-28 18:30:06 UTC (rev 272634)
@@ -5,11 +5,11 @@
 pkgbase=gdm
 pkgname=(gdm libgdm)
 pkgver=3.20.1
-pkgrel=1
-pkgdesc="Gnome Display Manager"
+pkgrel=2
+pkgdesc="Display manager and login screen"
 arch=(i686 x86_64)
 license=(GPL)
-url="http://www.gnome.org"
+url="https://wiki.gnome.org/Projects/GDM"
 depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-server-xwayland xorg-xhost)
 makedepends=(itstool intltool yelp-tools gobject-introspection)
 checkdepends=('check')
@@ -40,10 +40,11 @@
     --enable-ipv6 \
     --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
     --with-check-accelerated-directory=/usr/lib/gnome-session \
+    --with-default-pam-config=arch \
+    --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin \
     --with-gnome-settings-daemon-directory=/usr/lib/gnome-settings-daemon \
-    --without-tcp-wrappers \
     --without-plymouth \
-    --with-default-pam-config=arch
+    --without-tcp-wrappers
 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
 
@@ -67,9 +68,11 @@
   cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
-  chmod 711 "$pkgdir/var/log/gdm"
-  rm -r "$pkgdir/var/run"
+  chown -R 120:120 "$pkgdir/var/lib/gdm"
 
+  # Unused or created at start
+  rm -r "$pkgdir"/var/{cache,log,run}
+
 ### Split libgdm
   make -C libgdm DESTDIR="$pkgdir" uninstall
   mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir"
@@ -78,7 +81,6 @@
 package_libgdm() {
   pkgdesc="GDM support library"
   depends=(systemd glib2)
-  install=libgdm.install
 
   cd $pkgbase-$pkgver
   make -C libgdm DESTDIR="$pkgdir" install

Modified: gdm.install
===================================================================
--- gdm.install	2016-07-28 18:27:23 UTC (rev 272633)
+++ gdm.install	2016-07-28 18:30:06 UTC (rev 272634)
@@ -1,20 +1,7 @@
 post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  getent passwd gdm > /dev/null 2>&1 || useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm > /dev/null
-  chown root:gdm /var/log/gdm > /dev/null
-
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-  if (( $(vercmp $2 3.12.0) < 0 )); then
-    rm /etc/dconf/db/gdm
+  if ! getent passwd gdm >/dev/null; then
+    groupadd -g 120 gdm
+    useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+    passwd -ql gdm
   fi
 }
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}

Deleted: libgdm.install
===================================================================
--- libgdm.install	2016-07-28 18:27:23 UTC (rev 272633)
+++ libgdm.install	2016-07-28 18:30:06 UTC (rev 272634)
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}