[arch-commits] CVS update of extra/gnome/gnome-power-manager (2 files)

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 08:48:42
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-power-manager

Modified: PKGBUILD (1.10 -> 1.11) gnome-power-manager.install (1.4 -> 1.5)

upgpkg: gnome-power-manager 2.20.0-1
GNOME 2.20


-----------------------------+
 PKGBUILD                    |   21 ++++++++++-----------
 gnome-power-manager.install |   16 ++--------------
 2 files changed, 12 insertions(+), 25 deletions(-)


Index: extra/gnome/gnome-power-manager/PKGBUILD
diff -u extra/gnome/gnome-power-manager/PKGBUILD:1.10 extra/gnome/gnome-power-manager/PKGBUILD:1.11
--- extra/gnome/gnome-power-manager/PKGBUILD:1.10	Thu May 17 10:38:54 2007
+++ extra/gnome/gnome-power-manager/PKGBUILD	Sun Sep 23 08:48:42 2007
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD,v 1.10 2007/05/17 14:38:54 jgc Exp $
+# $Id: PKGBUILD,v 1.11 2007/09/23 12:48:42 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=2.18.3
+pkgver=2.20.0
 pkgrel=1
 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system."
 arch=(i686 x86_64)
 url="http://www.gnome.org/projects/gnome-power-manager/"
 license=('GPL')
-depends=('libnotify>=0.4.4' 'gnome-panel>=2.18.1' 'scrollkeeper')
-makedepends=('gettext' 'perlxml' 'pkgconfig')
+depends=('libnotify>=0.4.4' 'gnome-panel>=2.20.0' 'gstreamer0.10')
+makedepends=('gettext' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+options=(!emptydirs)
 install=gnome-power-manager.install
 groups=(gnome-extra)
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.18/${pkgname}-${pkgver}.tar.bz2
-        gnome-power-manager-2.17.92-tray-kde.patch
-	gpm-icon.patch)
-md5sums=('3341092fc87ced400631c3d635979426' 'ae15a1b3b6bb45b999175d2414710115'
-         '6d0e3dc50d7800b9ebbda6e2e13e598b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.20/${pkgname}-${pkgver}.tar.bz2
+        gnome-power-manager-2.17.92-tray-kde.patch)
+md5sums=('881f012dcbdff38a85603393cb9d39bb'
+         'ae15a1b3b6bb45b999175d2414710115')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/gpm-icon.patch || return 1
   patch -Np0 -i ${startdir}/src/gnome-power-manager-2.17.92-tray-kde.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
@@ -36,4 +35,4 @@
   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/gnome-power-manager/gnome-power-manager.install
diff -u extra/gnome/gnome-power-manager/gnome-power-manager.install:1.4 extra/gnome/gnome-power-manager/gnome-power-manager.install:1.5
--- extra/gnome/gnome-power-manager/gnome-power-manager.install:1.4	Sun Apr 22 12:33:43 2007
+++ extra/gnome/gnome-power-manager/gnome-power-manager.install	Sun Sep 23 08:48:42 2007
@@ -1,9 +1,7 @@
 pkgname=gnome-power-manager
 
 post_install() {
-  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
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -16,20 +14,10 @@
 }
 
 pre_remove() {
-  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
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
-  scrollkeeper-update -q -p var/lib/scrollkeeper
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }