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

[Jan de Groot]

    Date: Monday, June 18, 2007 @ 13:07:12
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/metacity

Modified: PKGBUILD (1.35 -> 1.36) metacity.install (1.8 -> 1.9)

upgpkg: metacity 2.18.5-1
Migrate to gconfpkg


------------------+
 PKGBUILD         |    8 ++++----
 metacity.install |   15 ++-------------
 2 files changed, 6 insertions(+), 17 deletions(-)


Index: extra/gnome/metacity/PKGBUILD
diff -u extra/gnome/metacity/PKGBUILD:1.35 extra/gnome/metacity/PKGBUILD:1.36
--- extra/gnome/metacity/PKGBUILD:1.35	Thu May 31 01:03:49 2007
+++ extra/gnome/metacity/PKGBUILD	Mon Jun 18 13:07:12 2007
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD,v 1.35 2007/05/31 05:03:49 eric Exp $
+# $Id: PKGBUILD,v 1.36 2007/06/18 17:07:12 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=metacity
-pkgver=2.18.3
+pkgver=2.18.5
 pkgrel=1
 pkgdesc="A window manager for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('startup-notification>=0.9' 'gconf>=2.18.0.1-2')
+depends=('startup-notification>=0.9' 'gconf>=2.18.0.1-4')
 makedepends=('perlxml' 'pkgconfig')
 url="http://www.gnome.org"
 groups=('gnome')
@@ -15,7 +15,7 @@
 install=metacity.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
 	metacity-2.18.2-session-crash.patch)
-md5sums=('1687de35cd7bb209641a5e1e223c5de1' 'c8c3249f2732691e593caf6ce7a5719b')
+md5sums=('7928172bf41f6b63976a62554a699674' 'c8c3249f2732691e593caf6ce7a5719b')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/metacity/metacity.install
diff -u extra/gnome/metacity/metacity.install:1.8 extra/gnome/metacity/metacity.install:1.9
--- extra/gnome/metacity/metacity.install:1.8	Sun Apr 22 11:10:54 2007
+++ extra/gnome/metacity/metacity.install	Mon Jun 18 13:07:12 2007
@@ -1,8 +1,7 @@
 pkgname=metacity
 
 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
+  usr/sbin/gconfpkg --install ${pkgname}
 }
 
 pre_upgrade() {
@@ -14,17 +13,7 @@
 }
 
 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}
 }
 
 op=$1