[arch-commits] CVS update of extra/devel/glade (PKGBUILD glade.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:54:10
  Author: jgc
    Path: /home/cvs-extra/extra/devel/glade

Modified: PKGBUILD (1.23 -> 1.24) glade.install (1.3 -> 1.4)

upgpkg: glade 3.2.0-2
Move to /usr


---------------+
 PKGBUILD      |   21 +++++++++------------
 glade.install |   25 +++----------------------
 2 files changed, 12 insertions(+), 34 deletions(-)


Index: extra/devel/glade/PKGBUILD
diff -u extra/devel/glade/PKGBUILD:1.23 extra/devel/glade/PKGBUILD:1.24
--- extra/devel/glade/PKGBUILD:1.23	Wed Mar 21 22:38:35 2007
+++ extra/devel/glade/PKGBUILD	Sun Apr 22 13:54:10 2007
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD,v 1.23 2007/03/22 02:38:35 kevin Exp $
+# $Id: PKGBUILD,v 1.24 2007/04/22 17:54:10 jgc Exp $
 # Maintainer: Kevin Piche <kevin at archlinux.org>
 
 pkgname=glade
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="user interface builder for GTK+ and GNOME."
 arch=(i686 x86_64)
-#depends=('libgail-gnome' 'libgnomeui')
-depends=('libgnomeui')
-makedepends=('intltool')
+license=('GPL' 'LGPL')
+depends=('libgnomeui>=2.18.1-2' 'scrollkeeper')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
+options=('nolibtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/glade3/3.2/glade3-$pkgver.tar.bz2)
@@ -21,13 +22,9 @@
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
 
-  ./configure --prefix=/opt/gnome --with-gtk2 --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+              --with-gtk2 --disable-scrollkeeper
   make || return 1
   make DESTDIR=$startdir/pkg install
-
-  # remove libtool files
-  rm -f $startdir/pkg/opt/gnome/lib/libgladeui-1.la
-  rm -f $startdir/pkg/opt/gnome/lib/glade3/modules/libgladegnome.la
-  rm -f $startdir/pkg/opt/gnome/lib/glade3/modules/libgladegtk.la
-  rm -f $startdir/pkg/opt/gnome/lib/glade3/bindings/libgladepython.la
 }
Index: extra/devel/glade/glade.install
diff -u extra/devel/glade/glade.install:1.3 extra/devel/glade/glade.install:1.4
--- extra/devel/glade/glade.install:1.3	Tue Sep 13 16:00:30 2005
+++ extra/devel/glade/glade.install	Sun Apr 22 13:54:10 2007
@@ -1,34 +1,15 @@
-pkgname=glade
-
 post_install() {
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-install -q -p var/lib/scrollkeeper "$scroll"
-  done
-
+  scrollkeeper-update -q -p var/lib/scrollkeeper
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }
 
-pre_upgrade() {
-  pre_remove $1
-}
-
 post_upgrade() {
   post_install $1
 }
 
-pre_remove() {
-  scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`)
-
-  for scroll in "${scrolls[@]}" ; do
-    scrollkeeper-uninstall -q -p var/lib/scrollkeeper "$scroll"
-  done
-
-}
-
 post_remove() {
-  update-desktop-database -q
+  post_install
 }
 
 op=$1