[arch-commits] Commit in xorg-xdm/trunk (PKGBUILD)

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 10:07:06
  Author: jgc
Revision: 3205

upgpkg: xorg-xdm 1.1.8-1
    Update to new version
- Fix FS#7804: add extra file to backup array
- Fix FS#9167: Make xdm use a login shell by default
- Fix FS#7821: Update to latest version, upstream fixed this one already.

Modified:
  xorg-xdm/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-21 13:49:40 UTC (rev 3204)
+++ PKGBUILD	2008-06-21 14:07:06 UTC (rev 3205)
@@ -2,35 +2,37 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-xdm
-pkgver=1.1.6
+pkgver=1.1.8
 pkgrel=1
 pkgdesc="X Display Manager"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-server-utils' 'libxft')
 makedepends=('pkgconfig')
-backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm)
+backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
 options=('!libtool')
 source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
+	Xsession-loginshell.patch
 	xdm.pam)
+md5sums=('cc1816bc62a3722ad509373b0b7f30fe'
+	 '234ae568e7b22cbc09433bb396ff3d80'
+         '419d6289ba6f851135f5c70c0e3cbec4')
 
 build() {
   cd ${startdir}/src/xdm-${pkgver}
+  patch -Np0 -i ${srcdir}/Xsession-loginshell.patch || return 1
   ./configure --prefix=/usr \
               --disable-static \
 	      --disable-xprint \
 	      --with-xdmconfigdir=/etc/X11/xdm \
 	      --with-xdmscriptdir=/etc/X11/xdm \
-	      --with-pixmapdir=/usr/share/xdm/pixmaps
+	      --with-pixmapdir=/usr/share/xdm/pixmaps || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
-  mkdir -p ${startdir}/pkg/etc/pam.d
-  install -m644 ${startdir}/src/xdm.pam ${startdir}/pkg/etc/pam.d/xdm
+  install -m755 -d ${startdir}/pkg/etc/pam.d
+  install -m644 ${startdir}/src/xdm.pam ${startdir}/pkg/etc/pam.d/xdm || return 1
 
   #Get rid of /usr/X11R6
   cd ${startdir}/pkg/etc/X11/xdm
   sed -i -e 's/\/X11R6//g' *
 }
-
-md5sums=('c89f8bc74fda4d19e5f374f59c88810f'
-         '419d6289ba6f851135f5c70c0e3cbec4')