[arch-commits] Commit in gdm/repos (4 files)

[Jan de Groot]

    Date: Friday, August 14, 2009 @ 16:12:36
  Author: jgc
Revision: 49666

Merged revisions 49664 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gdm/trunk

........
  r49664 | jgc | 2009-08-14 22:02:42 +0200 (Fri, 14 Aug 2009) | 6 lines
  
  upgpkg: gdm 2.20.10-2
      - Remove hack that changes /dev/tty* into /dev/vc/*, should fix gdm taking the wrong console
  - Add xorg-server to makedepends to right paths are configured
  - Fix usrbin -> usr/bin typo in default config
  - Fix user and group account creation, assign static gid to gdm (120)
  - Remove user and group from post_remove
........

Modified:
  gdm/repos/extra-i686/	(properties)
  gdm/repos/extra-i686/PKGBUILD
  gdm/repos/extra-i686/defaults.conf
  gdm/repos/extra-i686/gdm.install

---------------+
 PKGBUILD      |   24 +++++++++++-------------
 defaults.conf |    2 +-
 gdm.install   |   10 ++++++----
 3 files changed, 18 insertions(+), 18 deletions(-)


Property changes on: gdm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gdm/trunk:1-32148
   + /gdm/trunk:1-49665

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-14 20:03:20 UTC (rev 49665)
+++ extra-i686/PKGBUILD	2009-08-14 20:12:36 UTC (rev 49666)
@@ -2,36 +2,35 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=gdm
 pkgver=2.20.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('pam>=1.0.2' 'libdmx' 'tcp_wrappers>=7.6' 'libgnomecanvas>=2.26.0' 'librsvg>=2.26.0' 'gksu>=2.0.0' 'dbus-glib>=0.80' 'consolekit' 'zenity>=2.26.0')
-makedepends=('intltool' 'gnome-doc-utils>=0.16.0' 'pkgconfig')
+makedepends=('intltool' 'gnome-doc-utils>=0.16.0' 'pkgconfig' 'xorg-server')
 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.20/${pkgname}-${pkgver}.tar.bz2
-	gdm
-	defaults.conf
-	gdm.pam
-	gdm-autologin.pam)
+        gdm
+        defaults.conf
+        gdm.pam
+        gdm-autologin.pam)
 md5sums=('981c7ee7fbe453061e095ab52a3513f8'
          '2fdb6d6fd7fd8124b1e00621b3d238f9'
-         'c7cff1c785d59e7266f05be16b1ab933'
+         'fa61d885f0368756a7d8e7f7abdb11d9'
          '2e52f326dccc833e9c135f8df8297b12'
          '157f32e089a7aab50732dc122e592b35')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's|/dev/tty%d|/dev/vc/%d|' daemon/getvt.c || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/gdm \
-              --localstatedir=/var/lib --disable-static \
-	      --with-xevie=yes --disable-scrollkeeper \
-	      --enable-secureremote || return 1
+      --libexecdir=/usr/lib/gdm \
+      --localstatedir=/var/lib --disable-static \
+      --with-xevie=yes --disable-scrollkeeper \
+      --enable-secureremote || return 1
   sed -i -e 's|${prefix}|/usr|' config.h || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
@@ -44,7 +43,6 @@
   install -m755 -d "${pkgdir}/etc/rc.d"
   install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/" || return 1
   install -m444 "${srcdir}/defaults.conf" "${pkgdir}/usr/share/gdm/" || return 1 
-
   rm -f ${pkgdir}/usr/share/xsessions/gnome.desktop
   # fix gdmsetup 
   sed -i -e 's|^Exec=|Exec=gksu |' "${pkgdir}/usr/share/gdm/applications/gdmsetup.desktop" || return 1

Modified: extra-i686/defaults.conf
===================================================================
--- extra-i686/defaults.conf	2009-08-14 20:03:20 UTC (rev 49665)
+++ extra-i686/defaults.conf	2009-08-14 20:12:36 UTC (rev 49666)
@@ -192,7 +192,7 @@
 # Xorg Xnest: /usr/X11/bin/Xnest -audit 0 -name Xnest
 # Xsun Xnest: /usr/openwin/bin/Xnest -audit 0 -name Xnest -pn
 # Xephyr:     /usr/X11/bin/Xephyr -audit 0
-Xnest=/usrbin/Xephyr -audit 0
+Xnest=/usr/bin/Xephyr -audit 0
 # Xsun Xnest does not support font paths (passed into Xnest -fp argument)
 # that include the ":unscaled" suffix after a path name.  Setting this to
 # false will strip any ":unscaled" suffix from the font path.  If not 

Modified: extra-i686/gdm.install
===================================================================
--- extra-i686/gdm.install	2009-08-14 20:03:20 UTC (rev 49665)
+++ extra-i686/gdm.install	2009-08-14 20:12:36 UTC (rev 49666)
@@ -1,9 +1,9 @@
 pkgname=gdm
 
 post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd gdm
-  getent passwd gdm >/dev/null 2>&1 || usr/sbin/useradd -c 'PolicyKit' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm
+  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
+  passwd -l gdm > /dev/null
   chown root:gdm /var/lib/gdm > /dev/null
   chmod 1770 /var/lib/gdm > /dev/null
 
@@ -22,9 +22,11 @@
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  getent passwd gdm || userdel gdm
+  getent group gdm || groupdel gdm
 }