[arch-commits] CVS update of extra/lib/notification-daemon (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 13:49:12
  Author: jgc
    Path: /home/cvs-extra/extra/lib/notification-daemon

Modified: PKGBUILD (1.9 -> 1.10) notification-daemon.install (1.1 -> 1.2)

upgpkg: notification-daemon 0.3.7-2
Move to /usr


-----------------------------+
 PKGBUILD                    |   20 ++++++++++----------
 notification-daemon.install |   12 +++++++-----
 2 files changed, 17 insertions(+), 15 deletions(-)


Index: extra/lib/notification-daemon/PKGBUILD
diff -u extra/lib/notification-daemon/PKGBUILD:1.9 extra/lib/notification-daemon/PKGBUILD:1.10
--- extra/lib/notification-daemon/PKGBUILD:1.9	Mon Apr  2 13:46:47 2007
+++ extra/lib/notification-daemon/PKGBUILD	Sun Apr 22 13:49:12 2007
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD,v 1.9 2007/04/02 17:46:47 jgc Exp $
+# $Id: PKGBUILD,v 1.10 2007/04/22 17:49:12 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Mark Rosenstand <mark at borkware.net>
 
 pkgname="notification-daemon"
 pkgver=0.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Notification daemon for the desktop notifications framework"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.galago-project.org/specs/notification/"
-depends=('dbus-glib>=0.73' 'libsexy>=0.1.11' 'libwnck>=2.14.8' 'gconf>=2.18.0')
+depends=('dbus-glib>=0.73' 'libsexy>=0.1.11' 'libwnck>=2.14.8-2' 'gconf>=2.18.0.1-2')
 makedepends=('pkgconfig')
+options=('nolibtool')
 install=notification-daemon.install
 source=(http://www.galago-project.org/files/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('cbeae0f29a15ff93f0b763d9e1cdf1de')
 
 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/notification-daemon \
+              --localstatedir=/var --disable-static
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$startdir/pkg install
 
-  rm -f ${startdir}/pkg/opt/gnome/lib/notification-daemon-1.0/engines/libstandard.{a,la}
-
-  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/lib/notification-daemon/notification-daemon.install
diff -u extra/lib/notification-daemon/notification-daemon.install:1.1 extra/lib/notification-daemon/notification-daemon.install:1.2
--- extra/lib/notification-daemon/notification-daemon.install:1.1	Wed Sep 27 08:14:47 2006
+++ extra/lib/notification-daemon/notification-daemon.install	Sun Apr 22 13:49:12 2007
@@ -1,8 +1,8 @@
 pkgname=notification-daemon
 
 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
 }
 
 pre_upgrade() {
@@ -14,14 +14,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
 }
 
 op=$1