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

[Jan Steffens]

    Date: Friday, December 6, 2013 @ 00:39:32
  Author: heftig
Revision: 200817

move schema to libgdm (for shell)

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

----------------+
 PKGBUILD       |    8 ++++++--
 gdm.install    |   11 +----------
 libgdm.install |   11 +++++++++++
 3 files changed, 18 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-05 23:23:31 UTC (rev 200816)
+++ PKGBUILD	2013-12-05 23:39:32 UTC (rev 200817)
@@ -5,7 +5,7 @@
 pkgbase=gdm
 pkgname=(gdm libgdm)
 pkgver=3.10.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager"
 arch=(i686 x86_64)
 license=(GPL)
@@ -72,12 +72,16 @@
 
 ### Split libgdm
   make -C gui/libgdm DESTDIR="$pkgdir" uninstall
+  mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir"
 }
 
 package_libgdm() {
   pkgdesc="GDM support library"
-  depends=(systemd)
+  depends=(systemd glib2)
+  install=libgdm.install
 
   cd $pkgbase-$pkgver
   make -C gui/libgdm DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir/org.gnome.login-screen.gschema.xml" \
+    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml"
 }

Modified: gdm.install
===================================================================
--- gdm.install	2013-12-05 23:23:31 UTC (rev 200816)
+++ gdm.install	2013-12-05 23:39:32 UTC (rev 200817)
@@ -1,5 +1,3 @@
-pkgname=gdm
-
 post_install() {
   getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
   getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
@@ -7,25 +5,18 @@
   chown -R gdm:gdm /var/lib/gdm > /dev/null
   chown root:gdm /var/log/gdm > /dev/null
 
-  glib-compile-schemas /usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
   dconf update
 }
 
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    gconfpkg --uninstall ${pkgname}
-  fi
-}
-
 post_upgrade() {
   post_install
 }
 
 post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
   dconf update
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+
   getent passwd gdm >/dev/null 2>&1 && userdel gdm
   getent group gdm >/dev/null 2>&1 && groupdel gdm
 }

Added: libgdm.install
===================================================================
--- libgdm.install	                        (rev 0)
+++ libgdm.install	2013-12-05 23:39:32 UTC (rev 200817)
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}