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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:25:59
  Author: jgc
    Path: /home/cvs-extra/extra/network/ekiga

Modified: PKGBUILD (1.10 -> 1.11) ekiga.install (1.1 -> 1.2)

upgpkg: ekiga 2.0.9-1
Move to /usr


---------------+
 PKGBUILD      |   26 +++++++++++++-------------
 ekiga.install |   12 +++++++-----
 2 files changed, 20 insertions(+), 18 deletions(-)


Index: extra/network/ekiga/PKGBUILD
diff -u extra/network/ekiga/PKGBUILD:1.10 extra/network/ekiga/PKGBUILD:1.11
--- extra/network/ekiga/PKGBUILD:1.10	Mon Mar 19 18:25:01 2007
+++ extra/network/ekiga/PKGBUILD	Sun Apr 22 11:25:59 2007
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD,v 1.10 2007/03/19 22:25:01 jgc Exp $
+# $Id: PKGBUILD,v 1.11 2007/04/22 15:25:59 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tom K <tomk at runbox.com>
 
 pkgname=ekiga
-pkgver=2.0.7
+pkgver=2.0.9
 pkgrel=1
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
 arch=(i686 x86_64)
-depends=('opal>=2.2.6' 'libgnomeui>=2.18.1' 'evolution-data-server>=1.10.0')
-makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils')
-provides=(gnomemeeting)
-replaces=(gnomemeeting)
+depends=('opal>=2.2.8' 'libgnomeui>=2.18.1-2' 'evolution-data-server>=1.10.1-2' 'scrollkeeper' 'desktop-file-utils')
+makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils>=0.10.3')
+provides=('gnomemeeting')
+replaces=('gnomemeeting')
 install=ekiga.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f19bd39022c35221023acb960f708989')
+md5sums=('6c7a01faef8203d6f0ba0dfe6188bb1a')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper --enable-dbus
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var \
+	      --disable-scrollkeeper --enable-dbus
   make || return 1
   make DESTDIR=${startdir}/pkg GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 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/network/ekiga/ekiga.install
diff -u extra/network/ekiga/ekiga.install:1.1 extra/network/ekiga/ekiga.install:1.2
--- extra/network/ekiga/ekiga.install:1.1	Sun Mar 19 08:04:15 2006
+++ extra/network/ekiga/ekiga.install	Sun Apr 22 11:25:59 2007
@@ -1,8 +1,8 @@
 pkgname=ekiga
 
 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
 }
@@ -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() {