[arch-commits] CVS update of arch/build/lib/libglade (PKGBUILD glade.install)

[Jan de Groot]

    Date: Thursday, June 21, 2007 @ 14:46:23
  Author: jgc
    Path: /home/cvs-arch/arch/build/lib/libglade

Modified: PKGBUILD (1.22 -> 1.23) glade.install (1.2 -> 1.3)

upgpkg: libglade 2.6.1-1
Clean up dependencies, add license, fix install scriptlet


---------------+
 PKGBUILD      |   17 +++++++++--------
 glade.install |   18 ++++++++++++++----
 2 files changed, 23 insertions(+), 12 deletions(-)


Index: arch/build/lib/libglade/PKGBUILD
diff -u arch/build/lib/libglade/PKGBUILD:1.22 arch/build/lib/libglade/PKGBUILD:1.23
--- arch/build/lib/libglade/PKGBUILD:1.22	Sun Jul 16 16:24:14 2006
+++ arch/build/lib/libglade/PKGBUILD	Thu Jun 21 14:46:23 2007
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD,v 1.22 2006/07/16 20:24:14 andyrtr Exp $
-# Maintainer: dorphell <dorphell at archlinux.org>
+# $Id: PKGBUILD,v 1.23 2007/06/21 18:46:23 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=libglade
-pkgver=2.6.0
+pkgver=2.6.1
 pkgrel=1
 pkgdesc="Allows you to load glade interface files in a program at runtime"
 arch=(i686 x86_64)
-depends=('gtk2' 'docbook-xml')
-makedepends=('intltool' 'python' 'pkgconfig')
-options=(NOLIBTOOL)
+license=('LGPL')
+depends=('gtk2' 'libxml2')
+makedepends=('python' 'pkgconfig')
+options=('!libtool')
 install=glade.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2
 	libglade-2.0.1-nowarning.patch)
 url="http://www.gnome.org"
-md5sums=('81d7b2b64871ce23a5fae1e5da0b1f6e' '4f879c0ce550004905aa0fb24f25c353')
+md5sums=('489be887b26b9973f77e2c6111ab7d5a' '4f879c0ce550004905aa0fb24f25c353')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np1 -i ${startdir}/src/libglade-2.0.1-nowarning.patch || return 1
-  ./configure --prefix=/usr
+  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var
   make || return 1
   make DESTDIR=${startdir}/pkg install
   install -m755 libglade-convert ${startdir}/pkg/usr/bin/libglade-convert
Index: arch/build/lib/libglade/glade.install
diff -u arch/build/lib/libglade/glade.install:1.2 arch/build/lib/libglade/glade.install:1.3
--- arch/build/lib/libglade/glade.install:1.2	Thu Jan 12 05:06:07 2006
+++ arch/build/lib/libglade/glade.install	Thu Jun 21 14:46:23 2007
@@ -1,7 +1,17 @@
 post_install() {
-  /usr/bin/xmlcatalog --noout --add "system" \
+  if [ ! -d etc/xml ]; then
+    mkdir -p etc/xml
+  fi
+  if [ ! -e etc/xml/catalog ]; then
+    xmlcatalog --noout --create etc/xml/catalog
+  fi
+  xmlcatalog --noout --add "system" \
     "http://glade.gnome.org/glade-2.0.dtd" \
-    /usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
+    /usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog
+}
+
+pre_upgrade() {
+  post_remove
 }
 
 post_upgrade() {
@@ -10,8 +20,8 @@
 
 # arg 1:  the old package version
 post_remove() {
-  /usr/bin/xmlcatalog --noout --del \
-    /usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
+  xmlcatalog --noout --del \
+    /usr/share/xml/libglade/glade-2.0.dtd etc/xml/catalog
 }
 
 op=$1