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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:48:40
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/yelp

Modified: PKGBUILD (1.28 -> 1.29) yelp.install (1.5 -> 1.6)

upgpkg: yelp 2.18.1-2
Move to /usr


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


Index: extra/gnome/yelp/PKGBUILD
diff -u extra/gnome/yelp/PKGBUILD:1.28 extra/gnome/yelp/PKGBUILD:1.29
--- extra/gnome/yelp/PKGBUILD:1.28	Mon Apr  9 14:02:01 2007
+++ extra/gnome/yelp/PKGBUILD	Sun Apr 22 11:48:40 2007
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD,v 1.28 2007/04/09 18:02:01 jgc Exp $
+# $Id: PKGBUILD,v 1.29 2007/04/22 15:48:40 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=yelp
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A help browser for GNOME"
 arch=(i686 x86_64)
-depends=('xulrunner>=1.8.1' 'libgnomeui>=2.18.1' 'gnome-doc-utils>=0.10.2' 'startup-notification>=0.9' 'libbeagle' 'dbus-glib>=0.73')
+depends=('xulrunner>=1.8.1' 'libgnomeui>=2.18.1-2' 'gnome-doc-utils>=0.10.3' 'startup-notification>=0.9' 'libbeagle')
 makedepends=('perlxml' 'pkgconfig')
 groups=(gnome)
-license=(GPL)
+license=('GPL')
 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')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
   cd ${startdir}/src/yelp-${pkgver}
-  ./configure --prefix=/opt/gnome --enable-man
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --enable-man
   make LDFLAGS+="-R /opt/mozilla/lib/xulrunner" || return 1
-  mkdir -p ${startdir}/pkg/opt/gnome/bin/
   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/yelp/yelp.install
diff -u extra/gnome/yelp/yelp.install:1.5 extra/gnome/yelp/yelp.install:1.6
--- extra/gnome/yelp/yelp.install:1.5	Sun Mar 19 07:44:54 2006
+++ extra/gnome/yelp/yelp.install	Sun Apr 22 11:48:40 2007
@@ -1,10 +1,9 @@
 pkgname=yelp
 
 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 -q -p var/lib/scrollkeeper
-  update-desktop-database -q
 }
 
 pre_upgrade() {
@@ -16,18 +15,19 @@
 }
 
 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() {
-  update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
 }