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

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 11:54:55
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/vino

Modified: PKGBUILD (1.16 -> 1.17) vino.install (1.4 -> 1.5)

upgpkg: vino 2.18.1-2
Move to /usr


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


Index: extra/gnome/vino/PKGBUILD
diff -u extra/gnome/vino/PKGBUILD:1.16 extra/gnome/vino/PKGBUILD:1.17
--- extra/gnome/vino/PKGBUILD:1.16	Mon Apr  9 15:50:19 2007
+++ extra/gnome/vino/PKGBUILD	Sun Apr 22 11:54:54 2007
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD,v 1.16 2007/04/09 19:50:19 jgc Exp $
+# $Id: PKGBUILD,v 1.17 2007/04/22 15:54:54 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=vino
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="a VNC server for the GNOME desktop"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.18.1' 'gnutls>=1.6.1' 'libxdamage>=1.1' 'libxtst' 'dbus-glib>=0.73') 
+depends=('libgnomeui>=2.18.1-2' 'libxdamage>=1.1' 'libxtst')
 makedepends=('perlxml' 'pkgconfig')
 groups=('gnome-extra')
 url="http://www.gnome.org"
@@ -16,17 +16,14 @@
 md5sums=('caf0025b1ed95f03e29f9b40ae48b75b')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/opt/gnome
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/vino \
+              --localstatedir=/var
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
   
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/icons
-
-  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/vino/vino.install
diff -u extra/gnome/vino/vino.install:1.4 extra/gnome/vino/vino.install:1.5
--- extra/gnome/vino/vino.install:1.4	Fri Feb  9 05:49:04 2007
+++ extra/gnome/vino/vino.install	Sun Apr 22 11:54:54 2007
@@ -1,11 +1,8 @@
-[ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
 pkgname=vino
 
 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
-  update-desktop-database -q
+  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
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -18,18 +15,19 @@
 }
 
 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() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }