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

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 14:06:28
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/yelp

Modified: PKGBUILD (1.29 -> 1.30) yelp.install (1.6 -> 1.7)

upgpkg: yelp 2.20.0-1
GNOME 2.20


--------------+
 PKGBUILD     |   19 ++++++++++---------
 yelp.install |   17 +++--------------
 2 files changed, 13 insertions(+), 23 deletions(-)


Index: extra/gnome/yelp/PKGBUILD
diff -u extra/gnome/yelp/PKGBUILD:1.29 extra/gnome/yelp/PKGBUILD:1.30
--- extra/gnome/yelp/PKGBUILD:1.29	Sun Apr 22 11:48:40 2007
+++ extra/gnome/yelp/PKGBUILD	Sun Sep 23 14:06:28 2007
@@ -1,28 +1,29 @@
-# $Id: PKGBUILD,v 1.29 2007/04/22 15:48:40 jgc Exp $
+# $Id: PKGBUILD,v 1.30 2007/09/23 18:06:28 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=yelp
-pkgver=2.18.1
-pkgrel=2
+pkgver=2.20.0
+pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=(i686 x86_64)
-depends=('xulrunner>=1.8.1' 'libgnomeui>=2.18.1-2' 'gnome-doc-utils>=0.10.3' 'startup-notification>=0.9' 'libbeagle')
+depends=('xulrunner>=1.8.1.6' 'libgnomeui>=2.20.0' 'gnome-doc-utils>=0.12.0' 'startup-notification>=0.9' 'libxslt' 'libbeagle')
 makedepends=('perlxml' 'pkgconfig')
-groups=(gnome)
+groups=('gnome')
 license=('GPL')
+options=('!emptydirs')
 url="http://www.gnome.org"
 install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/yelp/2.18/yelp-${pkgver}.tar.bz2)
-md5sums=('84abbfe7e042706cbf21752957e29bf3')
+source=(http://ftp.gnome.org/pub/gnome/sources/yelp/2.20/yelp-${pkgver}.tar.bz2)
+md5sums=('8902618c343093b1c64ee6d647ec41ed')
 
 build() {
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
   cd ${startdir}/src/yelp-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --enable-man
+              --localstatedir=/var --enable-man --with-search=beagle
   make LDFLAGS+="-R /opt/mozilla/lib/xulrunner" || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
   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
Index: extra/gnome/yelp/yelp.install
diff -u extra/gnome/yelp/yelp.install:1.6 extra/gnome/yelp/yelp.install:1.7
--- extra/gnome/yelp/yelp.install:1.6	Sun Apr 22 11:48:40 2007
+++ extra/gnome/yelp/yelp.install	Sun Sep 23 14:06:28 2007
@@ -1,9 +1,7 @@
 pkgname=yelp
 
 post_install() {
-  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 -q -p var/lib/scrollkeeper
+  gconfpkg --install ${pkgname}
 }
 
 pre_upgrade() {
@@ -15,20 +13,11 @@
 }
 
 pre_remove() {
-  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=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
+  /bin/true
 }
 
 op=$1