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

[Jan de Groot]

    Date: Wednesday, March 12, 2008 @ 19:33:24
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-panel

Modified: PKGBUILD (1.47 -> 1.48) gnome-panel.install (1.16 -> 1.17)

upgpkg: gnome-panel 2.22.0-1
    GNOME 2.22


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


Index: extra/gnome/gnome-panel/PKGBUILD
diff -u extra/gnome/gnome-panel/PKGBUILD:1.47 extra/gnome/gnome-panel/PKGBUILD:1.48
--- extra/gnome/gnome-panel/PKGBUILD:1.47	Thu Jan 10 14:46:26 2008
+++ extra/gnome/gnome-panel/PKGBUILD	Wed Mar 12 19:33:24 2008
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD,v 1.47 2008/01/10 19:46:26 jgc Exp $
+# $Id: PKGBUILD,v 1.48 2008/03/12 23:33:24 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=2.20.3
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="The GNOME Panel"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnome.org"
-depends=('libwnck>=2.20.3' 'gnome-menus>=2.20.3' 'evolution-data-server>=1.12.3' 'gnome-desktop>=2.20.3')
-makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'pkgconfig')
-options=('!libtool')
+depends=('libwnck>=2.22.0' 'gnome-menus>=2.22.0' 'evolution-data-server>=2.22.0' 'gnome-desktop>=2.22.0' 'libgweather>=2.22.0' 'librsvg>=2.22.2')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'pkgconfig')
+options=('!libtool' '!emptydirs')
 groups=('gnome')
 install=gnome-panel.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0ddf04cea0859570216319d6f1f8c4d8')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('fe10c920c1f182a2bd5dba98863c786c')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --libexecdir=/usr/lib/gnome-panel \
-	      --disable-scrollkeeper
+	      --disable-scrollkeeper || return 1
   make || return 1
   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-panel/gnome-panel.install
diff -u extra/gnome/gnome-panel/gnome-panel.install:1.16 extra/gnome/gnome-panel/gnome-panel.install:1.17
--- extra/gnome/gnome-panel/gnome-panel.install:1.16	Fri Sep 21 17:25:58 2007
+++ extra/gnome/gnome-panel/gnome-panel.install	Wed Mar 12 19:33:24 2008
@@ -32,8 +32,3 @@
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*