[arch-commits] CVS update of extra/gnome/service-discovery-applet (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:46:46
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/service-discovery-applet

Modified: PKGBUILD (1.4 -> 1.5) service-discovery-applet.install (1.1 -> 1.2)

upgpkg: service-discovery-applet 0.4.3-2
Move


----------------------------------+
 PKGBUILD                         |   26 ++++++++++++++++----------
 service-discovery-applet.install |   28 ++++++++++++----------------
 2 files changed, 28 insertions(+), 26 deletions(-)


Index: extra/gnome/service-discovery-applet/PKGBUILD
diff -u extra/gnome/service-discovery-applet/PKGBUILD:1.4 extra/gnome/service-discovery-applet/PKGBUILD:1.5
--- extra/gnome/service-discovery-applet/PKGBUILD:1.4	Sun Oct 29 04:26:56 2006
+++ extra/gnome/service-discovery-applet/PKGBUILD	Sun Apr 22 13:46:46 2007
@@ -1,21 +1,27 @@
-# $Id: PKGBUILD,v 1.4 2006/10/29 09:26:56 arjan Exp $
-# Maintainer: Mark Rosenstand <mark at archlinux.org>
+# $Id: PKGBUILD,v 1.5 2007/04/22 17:46:46 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
 pkgname=service-discovery-applet
 pkgver=0.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Shows Zeroconf Services on your LAN and allows you to access them easily."
 arch=(i686 x86_64)
+license=('GPL')
 url="http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/?root=service-discovery-applet"
-license="GPL"
-depends=('avahi' 'gnome-python-extras')
-makedepends=('gettext' 'intltool')
+depends=('avahi' 'gnome-python-desktop' 'dbus-python')
+makedepends=('perlxml')
 install=service-discovery-applet.install
-source=(http://0pointer.de/~sebest/$pkgname-$pkgver.tar.gz)
+source=(http://0pointer.de/~sebest/${pkgname}-${pkgver}.tar.gz)
 md5sums=('68e67e75d4e5223e75a656b61e76d6d4')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/opt/gnome --disable-schemas-install
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+
+  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/service-discovery-applet/service-discovery-applet.install
diff -u extra/gnome/service-discovery-applet/service-discovery-applet.install:1.1 extra/gnome/service-discovery-applet/service-discovery-applet.install:1.2
--- extra/gnome/service-discovery-applet/service-discovery-applet.install:1.1	Sat Nov 19 04:04:52 2005
+++ extra/gnome/service-discovery-applet/service-discovery-applet.install	Sun Apr 22 13:46:46 2007
@@ -1,14 +1,8 @@
 pkgname=service-discovery-applet
 
 post_install() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-install-rule "$schema" >/dev/null 2>&1
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` > /dev/null 2>&1
+  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
 }
 
 pre_upgrade() {
@@ -20,14 +14,16 @@
 }
 
 pre_remove() {
-  schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-
-  export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
-  for schema in "${schemas[@]}" ; do
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule "$schema" >/dev/null 2>&1
-  done
-
-  kill -s HUP `pidof /opt/gnome/bin/gconfd-2` >/dev/null 2>&1
+  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=`usr/bin/gconftool-2 --get-default-source`
+  
+  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 op=$1