[arch-commits] CVS update of extra/network/galeon (PKGBUILD galeon.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 14:04:08
  Author: jgc
    Path: /home/cvs-extra/extra/network/galeon

Modified: PKGBUILD (1.43 -> 1.44) galeon.install (1.9 -> 1.10)

upgpkg: galeon 2.0.3-3
Move to /usr


----------------+
 PKGBUILD       |   21 +++++++++++----------
 galeon.install |   16 +++++++++-------
 2 files changed, 20 insertions(+), 17 deletions(-)


Index: extra/network/galeon/PKGBUILD
diff -u extra/network/galeon/PKGBUILD:1.43 extra/network/galeon/PKGBUILD:1.44
--- extra/network/galeon/PKGBUILD:1.43	Fri Nov 24 18:28:37 2006
+++ extra/network/galeon/PKGBUILD	Sun Apr 22 14:04:08 2007
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD,v 1.43 2006/11/24 23:28:37 jgc Exp $
+# $Id: PKGBUILD,v 1.44 2007/04/22 18:04:08 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org> 
 pkgname=galeon
 pkgver=2.0.3
-pkgrel=2
-install=galeon.install
+pkgrel=3
 pkgdesc="A GNOME web browser based on the gecko rendering engine."
 arch=(i686 x86_64)
-depends=('xulrunner>=1.8.1' 'gnome-desktop>=2.16.2')
-makedepends=('intltool' 'pkgconfig')
+license=('GPL')
+depends=('xulrunner>=1.8.1.3' 'gnome-desktop>=2.18.1')
+makedepends=('perlxml' 'pkgconfig')
 url="http://galeon.sourceforge.net/"
 source=(http://heanet.dl.sourceforge.net/sourceforge/galeon/galeon-${pkgver}.tar.bz2)
+install=galeon.install
 md5sums=('610fe2258e680f68bdf36ce7c1ba2a24')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
   cd ${startdir}/src/galeon-${pkgver}
   find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
@@ -21,7 +21,8 @@
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
 
-  ./configure --prefix=/opt/gnome \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+        --localstatedir=/var \
 	--without-debug \
 	--enable-nautilus-view=no \
 	--disable-werror \
@@ -29,7 +30,7 @@
   make LDFLAGS+="-R/opt/mozilla/lib/xulrunner" || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
-  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/network/galeon/galeon.install
diff -u extra/network/galeon/galeon.install:1.9 extra/network/galeon/galeon.install:1.10
--- extra/network/galeon/galeon.install:1.9	Sat Mar 25 07:33:29 2006
+++ extra/network/galeon/galeon.install	Sun Apr 22 14:04:08 2007
@@ -1,13 +1,13 @@
 pkgname=galeon
 
 post_install() {
-  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
+  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
   scrollkeeper-update -q -p var/lib/scrollkeeper
 
-  PID="`pidof -o %PPID /opt/gnome/libexec/bonobo-activation-server`"
+  PID="`pidof -o %PPID bonobo-activation-server`"
   if [ ! -z "${PID}" ]; then
     kill -s HUP ${PID}
   fi
@@ -22,20 +22,22 @@
 }
 
 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
 
-  GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` \
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
+    usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {
   update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
-  PID="`pidof -o %PPID /opt/gnome/libexec/bonobo-activation-server`"
+  PID="`pidof -o %PPID bonobo-activation-server`"
   if [ ! -z "${PID}" ]; then
     kill -s HUP ${PID}
   fi