[arch-commits] CVS update of extra/gnome/gnome-applets (PKGBUILD gnome-applets.install)

[Jan de Groot]

    Date: Sunday, September 23, 2007 @ 07:21:39
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-applets

Modified: PKGBUILD (1.38 -> 1.39) gnome-applets.install (1.12 -> 1.13)

upgpkg: gnome-applets 2.20.0-1
GNOME 2.20


-----------------------+
 PKGBUILD              |   31 ++++++++++---------------------
 gnome-applets.install |   15 ++-------------
 2 files changed, 12 insertions(+), 34 deletions(-)


Index: extra/gnome/gnome-applets/PKGBUILD
diff -u extra/gnome/gnome-applets/PKGBUILD:1.38 extra/gnome/gnome-applets/PKGBUILD:1.39
--- extra/gnome/gnome-applets/PKGBUILD:1.38	Wed May 30 05:51:11 2007
+++ extra/gnome/gnome-applets/PKGBUILD	Sun Sep 23 07:21:39 2007
@@ -1,41 +1,30 @@
-# $Id: PKGBUILD,v 1.38 2007/05/30 09:51:11 jgc Exp $
+# $Id: PKGBUILD,v 1.39 2007/09/23 11:21:39 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-applets
-pkgver=2.18.0
-pkgrel=3
+pkgver=2.20.0
+pkgrel=1
 pkgdesc="GNOME Applets"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gstreamer0.10-alsa' 'gnome-panel>=2.18.1' 'libgtop>=2.14.8-2' 'gucharmap>=1.10.0-2' 'libnotify>=0.4.4' 'cpufrequtils' 'libgnomekbd>=2.18.1-2' 'scrollkeeper')
-makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig' 'control-center>=2.18.1')
+depends=('gstreamer0.10-alsa' 'gnome-panel>=2.20.0' 'libgtop>=2.20.0' 'gucharmap>=1.10.1' 'libnotify>=0.4.4' 'cpufrequtils' 'libgnomekbd>=2.20.0')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'pkgconfig' 'gnome-control-center>=2.20.0')
+options=(!emptydirs)
 url="http://www.gnome.org"
 groups=(gnome)
 install=gnome-applets.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
-	disable-invest.patch
-	bgo427562.patch)
-md5sums=('db3ef99c00335798f30fc0a9162c0257' '454a74cf70b30bd748304119ee24907f'
-	 '2afb42b45e66bc75bd40bc05e83f042a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('985cfc3c58a72e1a92201bf4a4873b87')
 	
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  # Disable invest applet, it depends on gnome-python-desktop.
-  patch -Np0 -i ${startdir}/src/disable-invest.patch || return 1
-  
-  # Fix battery applet for linux 2.6.21 ACPI
-  patch -Np0 -i ${startdir}/src/bgo427562.patch || return 1
-
-  aclocal -I m4 || return 1
-  autoconf || return 1
-  automake || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-applets \
               --localstatedir=/var --disable-static \
 	      --disable-scrollkeeper
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
-  rm ${startdir}/pkg/usr/lib/*.la
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  rm -f ${startdir}/pkg/usr/lib/*.la
 
   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
Index: extra/gnome/gnome-applets/gnome-applets.install
diff -u extra/gnome/gnome-applets/gnome-applets.install:1.12 extra/gnome/gnome-applets/gnome-applets.install:1.13
--- extra/gnome/gnome-applets/gnome-applets.install:1.12	Sun Apr 22 12:21:58 2007
+++ extra/gnome/gnome-applets/gnome-applets.install	Sun Sep 23 07:21:39 2007
@@ -1,9 +1,7 @@
 pkgname=gnome-applets
 
 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,19 +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
 }