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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:37:19
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/epiphany

Modified: PKGBUILD (1.56 -> 1.57) epiphany.install (1.12 -> 1.13)

upgpkg: epiphany 2.18.1-2
Move to /usr


------------------+
 PKGBUILD         |   24 ++++++++++--------------
 epiphany.install |   12 +++++++-----
 2 files changed, 17 insertions(+), 19 deletions(-)


Index: extra/gnome/epiphany/PKGBUILD
diff -u extra/gnome/epiphany/PKGBUILD:1.56 extra/gnome/epiphany/PKGBUILD:1.57
--- extra/gnome/epiphany/PKGBUILD:1.56	Mon Apr  9 16:01:45 2007
+++ extra/gnome/epiphany/PKGBUILD	Sun Apr 22 11:37:19 2007
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.56 2007/04/09 20:01:45 jgc Exp $
+# $Id: PKGBUILD,v 1.57 2007/04/22 15:37:19 jgc Exp $
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=epiphany
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 install=epiphany.install
 pkgdesc="A GNOME2 web browser based on the mozilla rendering engine."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('xulrunner>=1.8.1.3' 'gnome-desktop>=2.18.0' 'iso-codes' 'dbus-glib>=0.73')
-makedepends=('perlxml' 'gnome-doc-utils' 'gnome-python>=2.18.0' 'pkgconfig' 'networkmanager')
+depends=('xulrunner>=1.8.1.3' 'gnome-desktop>=2.18.1' 'iso-codes' 'scrollkeeper' 'desktop-file-utils')
+makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'gnome-python>=2.18.0' 'pkgconfig' 'networkmanager')
 options=('nolibtool')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
@@ -17,13 +17,12 @@
 md5sums=('680a14ee43637728c94bcdf02ef16a4a')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
   cd ${startdir}/src/${pkgname}-${pkgver}
-  sed -i -e 's|pydefsdir =.*|pydefsdir = /usr/share/pygtk/2.0/defs|' \
-      src/Makefile.* || return 1
-  ./configure --prefix=/opt/gnome --enable-python \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+        --localstatedir=/var \
+        --enable-python \
   	--enable-certificate-manager \
 	--enable-dbus \
 	--disable-scrollkeeper \
@@ -32,10 +31,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
-  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/epiphany/epiphany.install
diff -u extra/gnome/epiphany/epiphany.install:1.12 extra/gnome/epiphany/epiphany.install:1.13
--- extra/gnome/epiphany/epiphany.install:1.12	Thu Feb  1 17:39:42 2007
+++ extra/gnome/epiphany/epiphany.install	Sun Apr 22 11:37:19 2007
@@ -1,9 +1,9 @@
 pkgname=epiphany
 
 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
@@ -19,15 +19,17 @@
 }
 
 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() {