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

[Jan de Groot]

    Date: Saturday, October 31, 2009 @ 15:12:02
  Author: jgc
Revision: 57513

Merged revisions 49191,57465 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libgsf/trunk

........
  r49191 | jgc | 2009-08-04 21:28:12 +0200 (Tue, 04 Aug 2009) | 1 line
  
  Clean up installation a little bit
........
  r57465 | jgc | 2009-10-31 17:58:00 +0100 (Sat, 31 Oct 2009) | 2 lines
  
  upgpkg: libgsf 1.14.16-1
      Update to 1.14.16
........

Modified:
  libgsf/repos/extra-x86_64/	(properties)
  libgsf/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)


Property changes on: libgsf/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libgsf/trunk:1-48913
   + /libgsf/trunk:1-57512

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-31 19:07:58 UTC (rev 57512)
+++ extra-x86_64/PKGBUILD	2009-10-31 19:12:02 UTC (rev 57513)
@@ -4,26 +4,26 @@
 
 pkgbase=libgsf
 pkgname=('libgsf' 'libgsf-gnome')
-pkgver=1.14.15
+pkgver=1.14.16
 pkgrel=1
 arch=(i686 x86_64)
 url="http://www.gnome.org/"
 license=('GPL' 'LGPL')
-makedepends=('libxml2>=2.7.3' 'glib2>=2.20.4' 'bzip2' 'intltool' 'pkgconfig' 'python' 'gnome-vfs>=2.24.1' 'libbonobo>=2.24.1' 'pygtk')
+makedepends=('libxml2>=2.7.3' 'glib2>=2.22.2' 'bzip2' 'intltool' 'pkgconfig' 'python' 'gnome-vfs>=2.24.2' 'libbonobo>=2.24.2' 'pygtk')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/1.14/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('5118e971b4257f50b6914404593f63cf')
+sha256sums=('11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --mandir=/usr/share/man --disable-static || return 1
+      --mandir=/usr/share/man --disable-static || return 1
   make || return 1
 }
 
 package_libgsf() {
   pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
-  depends=('libxml2>=2.7.3' 'glib2>=2.20.4' 'bzip2')
+  depends=('libxml2>=2.7.3' 'glib2>=2.22.2' 'bzip2')
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install || return 1
   rm -f "${pkgdir}/usr/share/man/man1/gsf-office-thumbnailer.1"
@@ -37,10 +37,10 @@
 
 package_libgsf-gnome() {
   pkgdesc="Libgsf GNOME components"
-  depends=("libgsf=${pkgver}" 'libbonobo>=2.24.1' 'gnome-vfs>=2.24.1')
+  depends=("libgsf=${pkgver}" 'libbonobo>=2.24.2' 'gnome-vfs>=2.24.2')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gsf DESTDIR="${pkgdir}" install || return 1
+  make -C gsf DESTDIR="${pkgdir}" install-libLTLIBRARIES || return 1
   make -C gsf-gnome DESTDIR="${pkgdir}" install || return 1
   make -C thumbnailer DESTDIR="${pkgdir}" install || return 1
   make -C python DESTDIR="${pkgdir}" install || return 1
@@ -50,7 +50,6 @@
   rm -f "${pkgdir}/usr/share/man/man1/gsf-vba-dump.1"
   rm -f "${pkgdir}"/usr/lib/python*/site-packages/gsf/_*
   rm -f "${pkgdir}"/usr/lib/libgsf-1.so*
-  rm -rf "${pkgdir}/usr/include/libgsf-1/gsf"
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m644 libgsf-gnome-1.pc "${pkgdir}/usr/lib/pkgconfig/" || return 1