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

[Jan de Groot]

    Date: Wednesday, March 12, 2008 @ 18:30:42
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/libgsf-gnome

Modified: PKGBUILD (1.19 -> 1.20) libgsf-gnome.install (1.4 -> 1.5)

upgpkg: libgsf-gnome 1.14.8-1
    GNOME 2.22


----------------------+
 PKGBUILD             |   35 ++++++++++++++++++-----------------
 libgsf-gnome.install |    5 -----
 2 files changed, 18 insertions(+), 22 deletions(-)


Index: extra/gnome/libgsf-gnome/PKGBUILD
diff -u extra/gnome/libgsf-gnome/PKGBUILD:1.19 extra/gnome/libgsf-gnome/PKGBUILD:1.20
--- extra/gnome/libgsf-gnome/PKGBUILD:1.19	Fri Sep  7 13:58:42 2007
+++ extra/gnome/libgsf-gnome/PKGBUILD	Wed Mar 12 18:30:42 2008
@@ -1,43 +1,44 @@
-# $Id: PKGBUILD,v 1.19 2007/09/07 17:58:42 jgc Exp $
+# $Id: PKGBUILD,v 1.20 2008/03/12 22:30:42 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=libgsf-gnome
-pkgver=1.14.7
+pkgver=1.14.8
 pkgrel=1
 pkgdesc="Adds gnome support to libgsf"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('gnome-vfs>=2.18.1' 'libbonobo>=2.18.0-2' "libgsf>=${pkgver}" 'gconf>=2.18.0.1-4')
+url="http://www.gnome.org/"
+depends=('gnome-vfs>=2.22.0' 'libbonobo>=2.22.0' "libgsf>=${pkgver}" 'gconf>=2.20.0')
 makedepends=('perlxml' 'pkgconfig')
-options=('!libtool')
+options=('!libtool' '!emptydirs')
 install=libgsf-gnome.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-${pkgver}.tar.bz2)
-md5sums=('6612f1e57d3974d609bedd2fd8ff6317')
+md5sums=('09e4b6639be79fa888cabc751f73674f')
 
 build() {
   cd ${startdir}/src/libgsf-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var
-  pushd gsf-gnome
-  sed -i -e 's|$(top_builddir)/gsf/libgsf-1.la|-lgsf-1|g' Makefile
+              --localstatedir=/var || return 1
+  pushd gsf-gnome || return 1
+  sed -i -e 's|$(top_builddir)/gsf/libgsf-1.la|-lgsf-1|g' Makefile || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install
   install -d -m755 ${startdir}/pkg/usr/lib/pkgconfig || return 1
   sed ../libgsf-gnome-1.pc -e 's|^Cflags.*|Cflags: -I${includedir}/libgsf-1|' >\
-	${startdir}/pkg/usr/lib/pkgconfig/libgsf-gnome-1.pc
+	${startdir}/pkg/usr/lib/pkgconfig/libgsf-gnome-1.pc || return 1
   popd
-  pushd thumbnailer
-  sed -i -e 's|$(top_builddir)/gsf/libgsf-1.la|-lgsf-1|g' Makefile
+  pushd thumbnailer || return 1
+  sed -i -e 's|$(top_builddir)/gsf/libgsf-1.la|-lgsf-1|g' Makefile || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
   popd
-  pushd doc
-  make DESTDIR=${startdir}/pkg install-manpageDATA
-  rm ${startdir}/pkg/usr/share/man/man1/gsf.1
+  pushd doc || return 1
+  make DESTDIR=${startdir}/pkg install-manpageDATA || return 1
+  rm -f ${startdir}/pkg/usr/share/man/man1/gsf.1
   popd
   
-  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/libgsf-gnome/libgsf-gnome.install
diff -u extra/gnome/libgsf-gnome/libgsf-gnome.install:1.4 extra/gnome/libgsf-gnome/libgsf-gnome.install:1.5
--- extra/gnome/libgsf-gnome/libgsf-gnome.install:1.4	Wed Sep  5 04:04:14 2007
+++ extra/gnome/libgsf-gnome/libgsf-gnome.install	Wed Mar 12 18:30:42 2008
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*