[arch-commits] Commit in gnome-power-manager/trunk (2 files)

Jan Steffens heftig at archlinux.org
Mon Mar 21 14:10:31 UTC 2011


    Date: Monday, March 21, 2011 @ 10:10:31
  Author: heftig
Revision: 115779

upgpkg: gnome-power-manager 2.91.92-1
Update to 2.91.92

Modified:
  gnome-power-manager/trunk/PKGBUILD
  gnome-power-manager/trunk/gnome-power-manager.install

-----------------------------+
 PKGBUILD                    |   17 +++++++++--------
 gnome-power-manager.install |   17 ++++++-----------
 2 files changed, 15 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-21 14:01:35 UTC (rev 115778)
+++ PKGBUILD	2011-03-21 14:10:31 UTC (rev 115779)
@@ -2,19 +2,20 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=2.91.90
+pkgver=2.91.92
 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' 'gconf' 'libcanberra' 'hicolor-icon-theme' 'upower' 'libgnome-keyring')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils' 'gnome-control-center')
+depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower'
+         'libgnome-keyring' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center')
 options=(!emptydirs)
 install=gnome-power-manager.install
 groups=(gnome-extra)
 source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.91/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('137b92409a970d28d62d567580aeba1244c65dc1faee666cde6ba6fcbba267f1')
+sha256sums=('9bac689315715ce3d083662099d0c6920b217112e471a331f61287b1aafaaf78')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,9 +26,9 @@
       --with-dbus-services=/usr/share/dbus-1/services \
       --disable-schemas-compile
   make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-power-manager ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

Modified: gnome-power-manager.install
===================================================================
--- gnome-power-manager.install	2011-03-21 14:01:35 UTC (rev 115778)
+++ gnome-power-manager.install	2011-03-21 14:10:31 UTC (rev 115779)
@@ -1,24 +1,19 @@
-pkgname=gnome-power-manager
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
   usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
 }
 
 pre_upgrade() {
-pre_remove $1
+  if (( $(vercmp $2 2.91.92) < 0 )); then
+    usr/sbin/gconfpkg --uninstall gnome-power-manager
+  fi
 }
 
 post_upgrade() {
-post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }




More information about the arch-commits mailing list