[arch-commits] Commit in metacity/trunk (PKGBUILD metacity.install)

[Jan de Groot]

    Date: Thursday, March 19, 2009 @ 18:45:39
  Author: jgc
Revision: 30459

upgpkg: metacity 2.26.0-1
    GNOME 2.26 - depend on zenity for dialogs

Modified:
  metacity/trunk/PKGBUILD
  metacity/trunk/metacity.install

------------------+
 PKGBUILD         |   12 ++++++------
 metacity.install |    5 -----
 2 files changed, 6 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-19 22:43:29 UTC (rev 30458)
+++ PKGBUILD	2009-03-19 22:45:39 UTC (rev 30459)
@@ -2,19 +2,19 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=metacity
-pkgver=2.24.0
+pkgver=2.26.0
 pkgrel=1
 pkgdesc="A window manager for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('startup-notification>=0.9' 'gconf>=2.24.0')
-makedepends=('perlxml' 'pkgconfig')
+depends=('startup-notification>=0.9' 'gconf>=2.26.0-2' 'zenity>=2.26.0')
+makedepends=('intltool' 'pkgconfig')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=metacity.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d4aa782d5f71b6c42514b239684a4aa3')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('eafb624e79fbcdab6da59acc222430b1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,6 +25,6 @@
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
   install -m755 -d "${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 metacity ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: metacity.install
===================================================================
--- metacity.install	2009-03-19 22:43:29 UTC (rev 30458)
+++ metacity.install	2009-03-19 22:45:39 UTC (rev 30459)
@@ -15,8 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-
-$op $*