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

[Jan de Groot]

    Date: Friday, March 14, 2008 @ 13:54:29
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/file-roller

Modified: PKGBUILD (1.45 -> 1.46) file-roller.install (1.11 -> 1.12)

upgpkg: file-roller 2.22.0-1
    GNOME 2.22


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


Index: extra/gnome/file-roller/PKGBUILD
diff -u extra/gnome/file-roller/PKGBUILD:1.45 extra/gnome/file-roller/PKGBUILD:1.46
--- extra/gnome/file-roller/PKGBUILD:1.45	Thu Jan 10 15:48:00 2008
+++ extra/gnome/file-roller/PKGBUILD	Fri Mar 14 13:54:29 2008
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD,v 1.45 2008/01/10 20:48:00 jgc Exp $
+# $Id: PKGBUILD,v 1.46 2008/03/14 17:54:29 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=file-roller
-pkgver=2.20.3
+pkgver=2.22.0
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.20.1' 'desktop-file-utils') 
-makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'pkgconfig' 'nautilus>=2.20.0')
+depends=('libgnomeui>=2.22.01' 'desktop-file-utils') 
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'pkgconfig' 'nautilus>=2.22.0')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7af6bac2e96ad9c728d791ce21dba8f5')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('81836da5b75575c45154ad851da699cb')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/file-roller \
               --localstatedir=/var --disable-static \
-	      --disable-scrollkeeper
+	      --disable-scrollkeeper || 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/file-roller/file-roller.install
diff -u extra/gnome/file-roller/file-roller.install:1.11 extra/gnome/file-roller/file-roller.install:1.12
--- extra/gnome/file-roller/file-roller.install:1.11	Sat Sep 22 18:37:51 2007
+++ extra/gnome/file-roller/file-roller.install	Fri Mar 14 13:54:29 2008
@@ -22,8 +22,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*