[arch-commits] CVS update of extra/gnome/gnome-screensaver (2 files)

[Jan de Groot]

    Date: Sunday, March 16, 2008 @ 09:01:30
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-screensaver

Modified: PKGBUILD (1.15 -> 1.16) gnome-screensaver.install (1.4 -> 1.5)

upgpkg: gnome-screensaver 2.22.0-1
    GNOME 2.22


---------------------------+
 PKGBUILD                  |   22 ++++++++++++----------
 gnome-screensaver.install |    5 -----
 2 files changed, 12 insertions(+), 15 deletions(-)


Index: extra/gnome/gnome-screensaver/PKGBUILD
diff -u extra/gnome/gnome-screensaver/PKGBUILD:1.15 extra/gnome/gnome-screensaver/PKGBUILD:1.16
--- extra/gnome/gnome-screensaver/PKGBUILD:1.15	Sun Sep 23 08:52:29 2007
+++ extra/gnome/gnome-screensaver/PKGBUILD	Sun Mar 16 09:01:30 2008
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD,v 1.15 2007/09/23 12:52:29 jgc Exp $
+# $Id: PKGBUILD,v 1.16 2008/03/16 13:01:30 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=2.20.0
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=('gnome-menus>=2.20.0' 'libxxf86misc' 'libgnomekbd>=2.20.0' 'libxss'
+depends=('gnome-menus>=2.22.0' 'libxxf86misc' 'libgnomekbd>=2.21.4.1' 'libxss'
 	 'libgl' 'libnotify')
 makedepends=('pkgconfig' 'gettext' 'perlxml' 'mesa' 'xscreensaver')
+groups=('gnome')
+options=(!emptydirs)
 install=gnome-screensaver.install
-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
         archify-pam.patch)
-md5sums=('d166a3ebf69289331b2ebcf5c0187fd9' '18c417676f6e8ef16ca2a10be74578a5')
+md5sums=('3f307d340d511c97192a9dc9b83a69f5' '18c417676f6e8ef16ca2a10be74578a5')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -25,15 +27,15 @@
               --localstatedir=/var --with-gdm-config=/usr/share/gdm/defaults.conf \
 	      --with-xscreensaverdir=/usr/share/xscreensaver/config \
 	      --with-xscreensaverhackdir=/usr/lib/xscreensaver \
-	      --with-dpms-ext
+	      --with-dpms-ext || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 
   #Migrate xscreensaver configuration files
   cd ${startdir}/pkg/usr/share/applications/screensavers
-  ${startdir}/src/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml
+  ${startdir}/src/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml || 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 -m755 -d ${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-screensaver/gnome-screensaver.install
diff -u extra/gnome/gnome-screensaver/gnome-screensaver.install:1.4 extra/gnome/gnome-screensaver/gnome-screensaver.install:1.5
--- extra/gnome/gnome-screensaver/gnome-screensaver.install:1.4	Sun Aug  5 12:22:34 2007
+++ extra/gnome/gnome-screensaver/gnome-screensaver.install	Sun Mar 16 09:01:30 2008
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*