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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 15:51:33
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/libgnomekbd

Modified: PKGBUILD (1.6 -> 1.7) libgnomekbd.install (1.4 -> 1.5)

upgpkg: libgnomekbd 2.21.4.1-1
    GNOME 2.22


---------------------+
 PKGBUILD            |   18 +++++++++---------
 libgnomekbd.install |    5 -----
 2 files changed, 9 insertions(+), 14 deletions(-)


Index: extra/gnome/libgnomekbd/PKGBUILD
diff -u extra/gnome/libgnomekbd/PKGBUILD:1.6 extra/gnome/libgnomekbd/PKGBUILD:1.7
--- extra/gnome/libgnomekbd/PKGBUILD:1.6	Sun Sep 23 06:24:19 2007
+++ extra/gnome/libgnomekbd/PKGBUILD	Fri Mar 14 15:51:33 2008
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD,v 1.6 2007/09/23 10:24:19 jgc Exp $
+# $Id: PKGBUILD,v 1.7 2008/03/14 19:51:33 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libgnomekbd
-pkgver=2.20.0
+pkgver=2.21.4.1
 pkgrel=1
 pkgdesc="Gnome keyboard library"
 url="http://gswitchit.sourceforge.net"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libxklavier>=3.3' 'libgnomeui>=2.20.0')
+depends=('libxklavier>=3.5' 'libgnomeui>=2.22.01')
 makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0b495d355e25c3531419cb3996be7e28')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.21/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ba87357d09cfb804f87a6c67b7460118')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static
+              --localstatedir=/var --disable-static || 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
 
   # broken makefiles...
-  rm -f ${startdir}/pkg/usr/lib/*.a
+  #rm -f ${startdir}/pkg/usr/lib/*.a
 
   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
+  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/libgnomekbd/libgnomekbd.install
diff -u extra/gnome/libgnomekbd/libgnomekbd.install:1.4 extra/gnome/libgnomekbd/libgnomekbd.install:1.5
--- extra/gnome/libgnomekbd/libgnomekbd.install:1.4	Sun Sep 23 06:24:19 2007
+++ extra/gnome/libgnomekbd/libgnomekbd.install	Fri Mar 14 15:51:33 2008
@@ -20,8 +20,3 @@
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*