[arch-commits] CVS update of extra/gnome/epiphany-extensions (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 12:45:40
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/epiphany-extensions

Modified: PKGBUILD (1.26 -> 1.27) epiphany-extensions.install (1.1 -> 1.2)

upgpkg: epiphany-extensions 2.18.1-2
Move to /usr


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


Index: extra/gnome/epiphany-extensions/PKGBUILD
diff -u extra/gnome/epiphany-extensions/PKGBUILD:1.26 extra/gnome/epiphany-extensions/PKGBUILD:1.27
--- extra/gnome/epiphany-extensions/PKGBUILD:1.26	Mon Apr  9 16:11:56 2007
+++ extra/gnome/epiphany-extensions/PKGBUILD	Sun Apr 22 12:45:40 2007
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD,v 1.26 2007/04/09 20:11:56 jgc Exp $
+# $Id: PKGBUILD,v 1.27 2007/04/22 16:45:40 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=epiphany-extensions
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 url="http://www.gnome.org/projects/epiphany/"
 pkgdesc="Various extentions for the Epiphany web browser"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('epiphany>=2.18.1' 'python>=2.5' 'pcre' 'opensp')
-makedepends=('pkgconfig')
+depends=('epiphany>=2.18.1-2' 'python>=2.5' 'pcre' 'opensp' 'scrollkeeper')
+makedepends=('pkgconfig' 'gnome-doc-utils>=0.10.3')
 options=('nolibtool')
 install=epiphany-extensions.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('71b7ff360be01d17702dae4cdb53bbcb')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --with-extensions=really-all --disable-scrollkeeper
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var \
+	      --with-extensions=really-all --disable-scrollkeeper
   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/gnome/epiphany-extensions/epiphany-extensions.install
diff -u extra/gnome/epiphany-extensions/epiphany-extensions.install:1.1 extra/gnome/epiphany-extensions/epiphany-extensions.install:1.2
--- extra/gnome/epiphany-extensions/epiphany-extensions.install:1.1	Sat Mar 24 08:58:17 2007
+++ extra/gnome/epiphany-extensions/epiphany-extensions.install	Sun Apr 22 12:45:40 2007
@@ -1,12 +1,11 @@
 pkgname=epiphany-extensions
 
 post_install() {
-  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-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  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() {
@@ -18,20 +17,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 -q -p var/lib/scrollkeeper
-  update-desktop-database -q
 }
 
 op=$1