[arch-commits] Commit in libgsf/trunk (PKGBUILD libgsf-gnome.install)

[Ionut Biru]

    Date: Saturday, December 17, 2011 @ 15:30:43
  Author: ibiru
Revision: 145138

update to 1.14.22
drop libgsf-gnome since upstream dropped it in this version

Modified:
  libgsf/trunk/PKGBUILD
Deleted:
  libgsf/trunk/libgsf-gnome.install

----------------------+
 PKGBUILD             |   59 ++++++++++---------------------------------------
 libgsf-gnome.install |   19 ---------------
 2 files changed, 13 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-17 18:24:13 UTC (rev 145137)
+++ PKGBUILD	2011-12-17 20:30:43 UTC (rev 145138)
@@ -2,60 +2,27 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
-pkgbase=libgsf
-pkgname=('libgsf' 'libgsf-gnome')
-pkgver=1.14.21
+pkgname=libgsf
+pkgver=1.14.22
 pkgrel=1
 arch=(i686 x86_64)
+pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
 url="http://www.gnome.org/"
 license=('GPL' 'LGPL')
-makedepends=('libxml2' 'glib2' 'bzip2' 'intltool' 'pkgconfig'
-             'python2' 'libbonobo' 'gconf' 'pygtk')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/1.14/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db')
+options=('!libtool')
+depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
+makedepends=('intltool' 'pygtk')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
+sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --mandir=/usr/share/man --disable-static
+  cd "$srcdir/$pkgname-$pkgver"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
   make
 }
 
 package_libgsf() {
-  pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
-  depends=('libxml2' 'glib2' 'bzip2')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-  rm -f "${pkgdir}/usr/share/man/man1/gsf-office-thumbnailer.1"
-  rm -f "${pkgdir}/usr/lib/libgsf-gnome"*
-  rm -rf "${pkgdir}/usr/include/libgsf-1/gsf-gnome/"
-  rm -rf "${pkgdir}/etc/gconf"
-  rm -f "${pkgdir}/usr/lib/pkgconfig/libgsf-gnome-1.pc"
-  rm -f "${pkgdir}/usr/bin/gsf-office-thumbnailer"
-  rm -f "${pkgdir}"/usr/lib/python*/site-packages/gsf/gnomemodule.so
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
-
-package_libgsf-gnome() {
-  pkgdesc="Libgsf GNOME components"
-  depends=("libgsf=${pkgver}" 'libbonobo' 'gconf')
-  install=libgsf-gnome.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gsf DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  make -C gsf-gnome DESTDIR="${pkgdir}" install
-  make -C thumbnailer DESTDIR="${pkgdir}" install
-  make -C python DESTDIR="${pkgdir}" install
-  make -C doc DESTDIR="${pkgdir}" install-manpageDATA
-
-  rm -f "${pkgdir}/usr/share/man/man1/gsf.1"
-  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*
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 libgsf-gnome-1.pc "${pkgdir}/usr/lib/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/libgsf-gnome.schemas" --domain libgsf "${pkgdir}/etc/gconf/schemas/"*.schemas
-  rm -f "${pkgdir}/etc/gconf/schemas/"*.schemas
-}

Deleted: libgsf-gnome.install
===================================================================
--- libgsf-gnome.install	2011-12-17 18:24:13 UTC (rev 145137)
+++ libgsf-gnome.install	2011-12-17 20:30:43 UTC (rev 145138)
@@ -1,19 +0,0 @@
-pkgname=libgsf-gnome
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}