3 files changed, 19 insertions, 13 deletions
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index dc88ff49c..28d2617b3 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197978 2013-10-30 12:02:48Z allan $
+# $Id: PKGBUILD 200818 2013-12-05 23:40:49Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 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 @@ package_gdm() {
 
 ### 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"
 }
diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install
index 4f15730f0..d43f06c2f 100644
--- a/extra/gdm/gdm.install
+++ b/extra/gdm/gdm.install
@@ -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 @@ post_install() {
   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
 }
diff --git a/extra/gdm/libgdm.install b/extra/gdm/libgdm.install
new file mode 100644
index 000000000..c19349f72
--- /dev/null
+++ b/extra/gdm/libgdm.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}