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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 19:31:10
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-session

Modified: PKGBUILD (1.42 -> 1.43) gnome-session.install (1.9 -> 1.10)

upgpkg: gnome-session 2.22.0-1
    GNOME 2.22


-----------------------+
 PKGBUILD              |   20 ++++++++++----------
 gnome-session.install |    5 -----
 2 files changed, 10 insertions(+), 15 deletions(-)


Index: extra/gnome/gnome-session/PKGBUILD
diff -u extra/gnome/gnome-session/PKGBUILD:1.42 extra/gnome/gnome-session/PKGBUILD:1.43
--- extra/gnome/gnome-session/PKGBUILD:1.42	Thu Jan 10 15:03:09 2008
+++ extra/gnome/gnome-session/PKGBUILD	Fri Mar 14 19:31:10 2008
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD,v 1.42 2008/01/10 20:03:09 jgc Exp $
+# $Id: PKGBUILD,v 1.43 2008/03/14 23:31:10 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-session
-pkgver=2.20.3
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('tcp_wrappers' 'libgnomeui>=2.20.1' 'gnome-control-center>=2.20.3' 'at-spi>=1.20.1')
+depends=('tcp_wrappers' 'libgnomeui>=2.22.01' 'gnome-settings-daemon>=2.22.0' 'at-spi>=1.22.0')
 makedepends=('perlxml' 'pkgconfig')
 options=(!emptydirs)
 install=gnome-session.install
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2
 	gsm-dbus.patch
 	gnome.desktop)
-md5sums=('f9d80e12c8fd79efa9786f617ba18bc7' '80f38a9a76938d08e6437fea24c841b3'
+md5sums=('5f9531565c5ec08104c3518c72c79f42' '80f38a9a76938d08e6437fea24c841b3'
 	 '152cddde06e16f16641746467f7ff965')
 
 build() {
@@ -25,14 +25,14 @@
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 	      --with-reboot-command=reboot --with-halt-command=halt \
 	      --with-rsh-command=ssh \
-	      --with-at-spi-registryd-directory=/usr/lib/at-spi
+	      --with-at-spi-registryd-directory=/usr/lib/at-spi || return 1
 
   make || return 1
-  make DESTDIR=${startdir}/pkg GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
+  make DESTDIR=${startdir}/pkg GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install || return 1
   install -d -m755 ${startdir}/pkg/etc/X11/sessions
-  install -m644 ${startdir}/src/gnome.desktop ${startdir}/pkg/etc/X11/sessions/gnome.desktop
+  install -m644 ${startdir}/src/gnome.desktop ${startdir}/pkg/etc/X11/sessions/gnome.desktop || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -d -m755 ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/gnome-session/gnome-session.install
diff -u extra/gnome/gnome-session/gnome-session.install:1.9 extra/gnome/gnome-session/gnome-session.install:1.10
--- extra/gnome/gnome-session/gnome-session.install:1.9	Sat Jul  7 06:39:24 2007
+++ extra/gnome/gnome-session/gnome-session.install	Fri Mar 14 19:31:10 2008
@@ -20,8 +20,3 @@
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*