[arch-commits] CVS update of extra/gnome/libgnomedb (PKGBUILD libgnomedb.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:45:47
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/libgnomedb

Modified: PKGBUILD (1.13 -> 1.14) libgnomedb.install (1.6 -> 1.7)

upgpkg: libgnomedb 1.2.2-5
Move to /usr


--------------------+
 PKGBUILD           |   21 ++++++++++++---------
 libgnomedb.install |   16 +++++++++++-----
 2 files changed, 23 insertions(+), 14 deletions(-)


Index: extra/gnome/libgnomedb/PKGBUILD
diff -u extra/gnome/libgnomedb/PKGBUILD:1.13 extra/gnome/libgnomedb/PKGBUILD:1.14
--- extra/gnome/libgnomedb/PKGBUILD:1.13	Thu Mar 22 18:56:06 2007
+++ extra/gnome/libgnomedb/PKGBUILD	Sun Apr 22 13:45:47 2007
@@ -1,28 +1,31 @@
-# $Id: PKGBUILD,v 1.13 2007/03/22 22:56:06 tobias Exp $
+# $Id: PKGBUILD,v 1.14 2007/04/22 17:45:47 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 force=y
 pkgname=libgnomedb
 pkgver=1.2.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Database Widget Library for Gnome"
 arch=(i686 x86_64)
-depends=('libgda>=1.2.3' 'gtksourceview>=1.8.0' 'libgnomeui>=2.16.0')
+license=('GPL')
+options=('nolibtool')
+depends=('libgda>=1.2.4' 'gtksourceview>=1.8.5-2' 'libgnomeui>=2.18.1-2' 'scrollkeeper')
 makedepends=('pkgconfig')
 install=libgnomedb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/1.2/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('cf8b1eb3aa3e7b18f46bc9bc9335dca7')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome
+  find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
+  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/gnome/libgnomedb/libgnomedb.install
diff -u extra/gnome/libgnomedb/libgnomedb.install:1.6 extra/gnome/libgnomedb/libgnomedb.install:1.7
--- extra/gnome/libgnomedb/libgnomedb.install:1.6	Sat Sep 30 06:55:20 2006
+++ extra/gnome/libgnomedb/libgnomedb.install	Sun Apr 22 13:45:47 2007
@@ -1,8 +1,9 @@
 pkgname=libgnomedb
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  scrollkeeper-update -p -q var/lib/scrollkeeper
 }
 
 pre_upgrade() {
@@ -14,16 +15,21 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
+  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
     schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
   else
     schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
   fi
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
   
-  opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
+post_remove() {
+  scrollkeeper-update -p -q var/lib/scrollkeeper
+}
 op=$1
 shift