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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 16:42:05
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-control-center

Modified: PKGBUILD (1.3 -> 1.4) gnome-control-center.install (1.1 -> 1.2)

upgpkg: gnome-control-center 2.22.0-1
    GNOME 2.22


------------------------------+
 PKGBUILD                     |   23 +++++++++++------------
 gnome-control-center.install |    5 -----
 2 files changed, 11 insertions(+), 17 deletions(-)


Index: extra/gnome/gnome-control-center/PKGBUILD
diff -u extra/gnome/gnome-control-center/PKGBUILD:1.3 extra/gnome/gnome-control-center/PKGBUILD:1.4
--- extra/gnome/gnome-control-center/PKGBUILD:1.3	Thu Jan 10 14:17:20 2008
+++ extra/gnome/gnome-control-center/PKGBUILD	Fri Mar 14 16:42:05 2008
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD,v 1.3 2008/01/10 19:17:20 jgc Exp $
+# $Id: PKGBUILD,v 1.4 2008/03/14 20:42:05 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=2.20.3
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 arch=(i686 x86_64)
-depends=('libgnomekbd>=2.20.0' 'metacity>=2.20.0' 'nautilus>=2.20.0' 'gstreamer0.10-base>=0.10.13' 'libxxf86misc' 'libxss' 'gnome-panel>=2.20.0' 'desktop-file-utils')
-makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'pkgconfig')
+depends=('libgnomekbd>=2.21.4.1' 'metacity>=2.22.0' 'nautilus>=2.22.0' 'gstreamer0.10-base>=0.10.15' 'libxss' 'gnome-panel>=2.22.0' 'desktop-file-utils')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'pkgconfig')
 url="http://www.gnome.org"
 groups=('gnome')
 replaces=('control-center')
@@ -16,23 +16,22 @@
 install=gnome-control-center.install
 license=('GPL')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('cd44c6b870d09ea5a049aa11385c97a6')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('e6730ac4ee8b14a577978dee6c1cb88f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   # Don't generate files which are generated in postinstall
-  sed -i -e '/update-desktop-database/d' vfs-methods/*/Makefile.*
+  sed -i -e '/update-desktop-database/d' vfs-methods/*/Makefile.* || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/bin \
               --localstatedir=/var --disable-static \
 	      --enable-gstreamer=0.10 --enable-aboutme \
-	      --disable-scrollkeeper --disable-update-mimedb
+	      --disable-scrollkeeper --disable-update-mimedb || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || 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-control-center/gnome-control-center.install
diff -u extra/gnome/gnome-control-center/gnome-control-center.install:1.1 extra/gnome/gnome-control-center/gnome-control-center.install:1.2
--- extra/gnome/gnome-control-center/gnome-control-center.install:1.1	Sun Sep 23 07:10:40 2007
+++ extra/gnome/gnome-control-center/gnome-control-center.install	Fri Mar 14 16:42:05 2008
@@ -22,8 +22,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*