[arch-commits] Commit in notification-daemon/repos (3 files)

[Jan de Groot]

    Date: Saturday, August 15, 2009 @ 09:51:39
  Author: jgc
Revision: 49733

Merged revisions 49731 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/notification-daemon/trunk

........
  r49731 | jgc | 2009-08-15 15:45:51 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  upgpkg: notification-daemon 0.4.0-3
      Update icon cache on post_install/upgrade/remove, make use of new gconf domain options
........

Modified:
  notification-daemon/repos/extra-i686/	(properties)
  notification-daemon/repos/extra-i686/PKGBUILD
  notification-daemon/repos/extra-i686/notification-daemon.install

-----------------------------+
 PKGBUILD                    |   10 +++++-----
 notification-daemon.install |    5 +++++
 2 files changed, 10 insertions(+), 5 deletions(-)


Property changes on: notification-daemon/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /notification-daemon/trunk:1-29398
   + /notification-daemon/trunk:1-49732

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-15 13:46:28 UTC (rev 49732)
+++ extra-i686/PKGBUILD	2009-08-15 13:51:39 UTC (rev 49733)
@@ -4,12 +4,12 @@
 
 pkgname="notification-daemon"
 pkgver=0.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Notification daemon for the desktop notifications framework"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.galago-project.org/specs/notification/"
-depends=('libsexy>=0.1.11' 'libwnck>=2.24.2' 'gconf>=2.24.0' 'gstreamer0.10-base' 'libnotify>=0.4.5' 'libglade>=2.6.3')
+depends=('libsexy>=0.1.11' 'libwnck>=2.26.1' 'gconf>=2.26.2' 'gstreamer0.10-base' 'libnotify>=0.4.5' 'libglade>=2.6.4' 'hicolor-icon-theme')
 groups=('gnome')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool' '!emptydirs')
@@ -20,12 +20,12 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/notification-daemon-1.0 \
-              --localstatedir=/var --disable-static
+      --libexecdir=/usr/lib/notification-daemon-1.0 \
+      --localstatedir=/var --disable-static
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
   install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain notification-daemon ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: extra-i686/notification-daemon.install
===================================================================
--- extra-i686/notification-daemon.install	2009-08-15 13:46:28 UTC (rev 49732)
+++ extra-i686/notification-daemon.install	2009-08-15 13:51:39 UTC (rev 49733)
@@ -2,6 +2,7 @@
 
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -15,3 +16,7 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}