[arch-commits] Commit in libgsf-gnome/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Friday, December 26, 2008 @ 14:00:52
  Author: jgc
Revision: 22410

Merged revisions 356,22407 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/libgsf-gnome/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r22407 | jgc | 2008-12-26 18:57:05 +0000 (Fri, 26 Dec 2008) | 1 line
  
  upgpkg: libgsf-gnome 1.14.10-1
........

Modified:
  libgsf-gnome/repos/extra-i686/	(properties)
  libgsf-gnome/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)


Property changes on: libgsf-gnome/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libgsf-gnome/trunk:1
   + /libgsf-gnome/trunk:1-22409

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-26 18:58:32 UTC (rev 22409)
+++ extra-i686/PKGBUILD	2008-12-26 19:00:52 UTC (rev 22410)
@@ -3,42 +3,37 @@
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=libgsf-gnome
-pkgver=1.14.8
+pkgver=1.14.10
 pkgrel=1
 pkgdesc="Adds gnome support to libgsf"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 url="http://www.gnome.org/"
-depends=('gnome-vfs>=2.22.0' 'libbonobo>=2.22.0' "libgsf>=${pkgver}" 'gconf>=2.20.0')
-makedepends=('perlxml' 'pkgconfig')
+depends=('gnome-vfs>=2.24.0' 'libbonobo>=2.24.0' "libgsf>=${pkgver}")
+makedepends=('intltool' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 install=libgsf-gnome.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/libgsf-${pkgver}.tar.bz2)
-md5sums=('09e4b6639be79fa888cabc751f73674f')
+md5sums=('f9b2f309089af683066ff0b319227e57')
 
 build() {
-  cd ${startdir}/src/libgsf-${pkgver}
+  cd "${srcdir}/libgsf-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --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 || return 1
-  popd
-  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 || return 1
-  popd
-  pushd doc || return 1
-  make DESTDIR=${startdir}/pkg install-manpageDATA || return 1
-  rm -f ${startdir}/pkg/usr/share/man/man1/gsf.1
-  popd
+              --localstatedir=/var --disable-static  || return 1
+
+  sed -e 's|$(top_builddir)/gsf/libgsf-1.la|-lgsf-1|g' \
+      -i gsf-gnome/Makefile thumbnailer/Makefile || return 1
+  make -C gsf-gnome || return 1
+  make -C thumbnailer || return 1
+  make -C gsf-gnome DESTDIR="${pkgdir}" install || return 1
+  make -C thumbnailer DESTDIR="${pkgdir}" install || return 1
+  make -C doc DESTDIR="${pkgdir}" install-manpageDATA || return 1
+  rm -f ${pkgdir}/usr/share/man/man1/gsf.1
+  rm -f ${pkgdir}/usr/share/man/man1/gsf-vba-dump.1
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  install -m644 libgsf-gnome-1.pc "${pkgdir}/usr/lib/pkgconfig/" || return 1
   
-  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
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }