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

[Ionut Biru]

    Date: Friday, September 2, 2011 @ 10:19:26
  Author: ibiru
Revision: 136865

update to 3.1.90

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

-------------+
 PKGBUILD    |   24 ++++++++++--------------
 gdm.install |    2 ++
 2 files changed, 12 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-02 14:00:59 UTC (rev 136864)
+++ PKGBUILD	2011-09-02 14:19:26 UTC (rev 136865)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
-pkgver=3.0.4
-pkgrel=2
+pkgver=3.1.90
+pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -10,33 +10,28 @@
 backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
 groups=('gnome-extra')
 options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb')
+depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
 makedepends=('intltool' 'gnome-doc-utils' 'xorg-server')
-conflicts=('fast-user-switch-applet')
-replaces=('fast-user-switch-applet')
 install=gdm.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        2.91_fix_external_program_directories.patch
-        gdm-vt-allocation-hack.patch
+        fix_external_program_directories.patch
         gdm.pam
         gdm-autologin.pam
         gdm)
-sha256sums=('7d2947fbc96c43cc94fd5915882655820c5453a1b1b11643b3c1be361f4288fd'
-            '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1'
-            '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
+sha256sums=('3fb9c52b8a18f39539c53d84645b89836de25a3eb3a0b84388e76a4f988178bf'
+            'c02af756912f744a0b32c05f2b552fd425b4d30cf9f8fe22e04be8746c325fc0'
             'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
             '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
             '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch"
-  patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
+  patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gdm \
       --localstatedir=/var \
-      --with-at-spi-registryd-directory=/usr/lib/at-spi \
+      --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
       --disable-scrollkeeper \
       --disable-static \
       --without-tcp-wrappers
@@ -48,10 +43,11 @@
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -r "${pkgdir}/etc/gconf/schemas/"
+  rm -r "${pkgdir}/etc/gconf/"
 
   install -m644 "${srcdir}/gdm.pam" "${pkgdir}/etc/pam.d/gdm"
   install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin"
+  sed -e 's/include\s*system-auth/required\tpam_unix.so/' -i "${pkgdir}/etc/pam.d/gdm-welcome"
 
   install -m755 -d "${pkgdir}/etc/rc.d"
   install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/"

Modified: gdm.install
===================================================================
--- gdm.install	2011-09-02 14:00:59 UTC (rev 136864)
+++ gdm.install	2011-09-02 14:19:26 UTC (rev 136865)
@@ -8,6 +8,7 @@
 
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   gconfpkg --install ${pkgname}
+  glib-compile-schemas usr/share/glib-2.0/schemas
 }
 
 pre_remove() {
@@ -21,6 +22,7 @@
 }
 
 post_remove() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
   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