[arch-commits] CVS update of extra/gnome/gdm (PKGBUILD gdm.install)

[Jan de Groot]

    Date: Saturday, September 22, 2007 @ 17:56:01
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gdm

Modified: PKGBUILD (1.61 -> 1.62) gdm.install (1.13 -> 1.14)

upgpkg: gdm 2.20.0-1
GNOME 2.20


-------------+
 PKGBUILD    |   31 ++++++++++---------------------
 gdm.install |    1 -
 2 files changed, 10 insertions(+), 22 deletions(-)


Index: extra/gnome/gdm/PKGBUILD
diff -u extra/gnome/gdm/PKGBUILD:1.61 extra/gnome/gdm/PKGBUILD:1.62
--- extra/gnome/gdm/PKGBUILD:1.61	Sat Aug  4 17:30:10 2007
+++ extra/gnome/gdm/PKGBUILD	Sat Sep 22 17:56:00 2007
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD,v 1.61 2007/08/04 21:30:10 jgc Exp $
+# $Id: PKGBUILD,v 1.62 2007/09/22 21:56:00 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
-pkgver=2.18.4
+pkgver=2.20.0
 pkgrel=1
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('pam' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.14.0-2' 'librsvg>=2.18.0' 'gksu' 'popt' 'xorg-xsm' 'dbus-glib>=0.7.4' 'scrollkeeper')
-makedepends=('perlxml' 'zenity>=2.18.1' 'gnome-doc-utils>=0.10.3' 'pkgconfig')
+depends=('pam>=0.99.8' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.20.0' 'librsvg>=2.18.2' 'gksu' 'xorg-xsm' 'dbus-glib>=0.7.4')
+makedepends=('perlxml' 'zenity>=2.20.0' 'gnome-doc-utils>=0.12.0' 'pkgconfig')
 install=gdm.install
 url="http://www.gnome.org"
 groups=('gnome-extra')
 backup=('etc/gdm/custom.conf' 'etc/pam.d/gdm' 'etc/pam.d/gdm-autologin')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2
 	gdm
 	defaults.conf
 	gdm.pam
-	gdm-autologin.pam
-	gdm-stop.diff)
-md5sums=('53e5f5820fa67abf55c37ea7570807b7' '770fe5aeb8d35271a5a2330ce01508f0'
+	gdm-autologin.pam)
+md5sums=('cf374113a1f837b0df916572625b5078' '770fe5aeb8d35271a5a2330ce01508f0'
          '682c0602f2f235085d5d9255428d7a35' 'b20fe3c8487a039050986d60e45233a9'
-	 '157f32e089a7aab50732dc122e592b35' 'aebb718505664be074531c8dfaf04dfc')
+	 '157f32e089a7aab50732dc122e592b35')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -29,11 +28,6 @@
   sed -i -e 's|/dev/tty%d|/dev/vc/%d|' daemon/getvt.c || return 1
 
   cd ${startdir}/src/${pkgname}-${pkgver}
-  if [ -f omf.make ]; then
-    find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
-    sed -i -e 's/-scrollkeeper-update.*//' omf.make
-  fi
-
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gdm \
               --localstatedir=/var/lib --disable-static \
@@ -41,9 +35,7 @@
 	      --enable-secureremote
   sed -i -e 's|${prefix}|/usr|' config.h || return 1
   make || return 1
-  # patch to get rid of errors on shutdown/reboot
-  patch -Np0 -i ${startdir}/src/gdm-stop.diff || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install
   mkdir -p ${startdir}/pkg/etc/rc.d
 
   #PAM, we use our own, not Redhat stuff
@@ -58,8 +50,5 @@
   rm -rf ${startdir}/pkg/usr/share/xsessions
   
   # fix gdmsetup 
-  sed -i -e 's|^Exec=|Exec=gksu |' ${startdir}/pkg/usr/share/applications/gdmsetup.desktop || return 1
-  sed -i -e '/^TryExec=$/d' ${startdir}/pkg/usr/share/applications/gdmflexiserver-xnest.desktop || return 1
-
-  mv ${startdir}/pkg/var/lib/log ${startdir}/pkg/var/log
+  sed -i -e 's|^Exec=|Exec=gksu |' ${startdir}/pkg/usr/share/gdm/applications/gdmsetup.desktop
 }
Index: extra/gnome/gdm/gdm.install
diff -u extra/gnome/gdm/gdm.install:1.13 extra/gnome/gdm/gdm.install:1.14
--- extra/gnome/gdm/gdm.install:1.13	Sat Aug  4 17:30:10 2007
+++ extra/gnome/gdm/gdm.install	Sat Sep 22 17:56:00 2007
@@ -5,7 +5,6 @@
   chown root.gdm /var/lib/gdm > /dev/null
   chmod 1770 /var/lib/gdm > /dev/null
 
-  scrollkeeper-update -q -p var/lib/scrollkeeper 
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }