From 448c1e0d28a7c5c0deb705b20c220b1400da9795 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 17 Dec 2011 17:57:04 +0100
Subject: [PATCH] libgsf: update to 1.14.22.

---
 srcpkgs/libgsf/depends                |  2 +-
 srcpkgs/libgsf/libgsf-devel.template  | 15 ++++-----------
 srcpkgs/libgsf/libgsf-python.template |  2 --
 srcpkgs/libgsf/template               | 14 ++++++--------
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/libgsf/depends b/srcpkgs/libgsf/depends
index 4067ffdd00..41ff1f607d 100644
--- a/srcpkgs/libgsf/depends
+++ b/srcpkgs/libgsf/depends
@@ -1,2 +1,2 @@
 abi_depends=">=1.14.11"
-api_depends="${abi_depends}"
+api_depends=">=1.14.22"
diff --git a/srcpkgs/libgsf/libgsf-devel.template b/srcpkgs/libgsf/libgsf-devel.template
index 73a6cdee57..35f9928f58 100644
--- a/srcpkgs/libgsf/libgsf-devel.template
+++ b/srcpkgs/libgsf/libgsf-devel.template
@@ -1,24 +1,17 @@
 # Template file for 'libgsf-devel'.
 #
-short_desc="${sourcepkg} development files"
+short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run pkg-config
 Add_dependency run glib-devel
 Add_dependency run libxml2-devel
-Add_dependency run glibc-devel
-Add_dependency run zlib-devel
-Add_dependency run bzip2-devel
 Add_dependency run libgsf
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/libgsf/libgsf-python.template b/srcpkgs/libgsf/libgsf-python.template
index 489e6e9d4d..51a5e7fef0 100644
--- a/srcpkgs/libgsf/libgsf-python.template
+++ b/srcpkgs/libgsf/libgsf-python.template
@@ -5,9 +5,7 @@ long_desc="${long_desc}
 
  This package contains the Python bindings."
 
-revision=2
 pycompile_module="gsf"
-
 Add_dependency run python
 
 do_install()
diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template
index cb0c042416..1e15e28ae8 100644
--- a/srcpkgs/libgsf/template
+++ b/srcpkgs/libgsf/template
@@ -1,20 +1,19 @@
 # Template build file for 'libgsf'.
 pkgname=libgsf
-version=1.14.20
-distfiles="${GNOME_SITE}/libgsf/1.14/$pkgname-$version.tar.bz2"
+version=1.14.22
+homepage="http://www.gnome.org/"
+distfiles="${GNOME_SITE}/libgsf/1.14/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--disable-schemas-install
---without-gnome-vfs --without-bonobo"
-revision=3
+configure_args="--disable-static"
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=df82cd86e472a6f8e566976eb7eb8f587aac2639c1448b14b4dbf4db7da1ada6
+license="GPL-2, LGPL-2.1"
+checksum=a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f
 long_desc="
  libgsf provides an efficient extensible I/O abstraction for dealing with
  different structured file formats. It has support for Microsoft OLE2
  streams and Zip import. The aim of this library is to replace libole2."
 
-# XXX: investigate gnome stuff.
 subpackages="$pkgname-python $pkgname-devel"
 
 Add_dependency build pkg-config
@@ -26,5 +25,4 @@ Add_dependency build glibc-devel
 Add_dependency build zlib-devel
 Add_dependency build bzip2-devel
 Add_dependency build gdk-pixbuf-devel
-Add_dependency build GConf-devel
 Add_dependency build pygtk-devel