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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:43:48
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/devhelp

Modified: PKGBUILD (1.10 -> 1.11) devhelp.install (1.4 -> 1.5)

upgpkg: devhelp 0.13-2
Move to /usr


-----------------+
 PKGBUILD        |   25 +++++++++++--------------
 devhelp.install |   12 +++++++-----
 2 files changed, 18 insertions(+), 19 deletions(-)


Index: extra/gnome/devhelp/PKGBUILD
diff -u extra/gnome/devhelp/PKGBUILD:1.10 extra/gnome/devhelp/PKGBUILD:1.11
--- extra/gnome/devhelp/PKGBUILD:1.10	Thu Feb 15 10:49:04 2007
+++ extra/gnome/devhelp/PKGBUILD	Sun Apr 22 12:43:48 2007
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.10 2007/02/15 15:49:04 jgc Exp $
-# Maintainer: Arjan Timmerman <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.11 2007/04/22 16:43:48 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=devhelp
 pkgver=0.13
-pkgrel=1
+pkgrel=2
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.imendio.com/projects/devhelp/"
-license=(GPL)
-depends=('gconf>=2.16.0' 'libglade>=2.6.0' 'libwnck>=2.16.0' 'xulrunner>=1.8.1.1')
+depends=('gconf>=2.18.0.1-2' 'libglade>=2.6.0' 'libwnck>=2.18.0-2' 'xulrunner>=1.8.1.3' 'desktop-file-utils')
 makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
 install="devhelp.install"
@@ -17,21 +17,18 @@
 md5sums=('230c05c1e13ba6ae44c94e034ea77348')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
   cd ${startdir}/src/devhelp-${pkgver}
-  aclocal -I ./m4 ${ACLOCAL_FLAGS}
+  aclocal -I ./m4
   autoconf
   automake
-  ./configure --prefix=/opt/gnome --disable-static
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static
   make LDFLAGS+="-R /opt/mozilla/lib/xulrunner" || 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
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  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/devhelp/devhelp.install
diff -u extra/gnome/devhelp/devhelp.install:1.4 extra/gnome/devhelp/devhelp.install:1.5
--- extra/gnome/devhelp/devhelp.install:1.4	Thu Feb 15 10:49:04 2007
+++ extra/gnome/devhelp/devhelp.install	Sun Apr 22 12:43:48 2007
@@ -1,8 +1,8 @@
 pkgname=devhelp
 
 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
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
@@ -16,14 +16,16 @@
 }
 
 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() {