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

[Ionut Biru]

    Date: Saturday, March 10, 2012 @ 07:44:39
  Author: ibiru
Revision: 152864

update to 3.3.90

Modified:
  mutter/trunk/PKGBUILD
  mutter/trunk/mutter.install

----------------+
 PKGBUILD       |   21 +++++++++------------
 mutter.install |   12 +++++++-----
 2 files changed, 16 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-10 12:43:37 UTC (rev 152863)
+++ PKGBUILD	2012-03-10 12:44:39 UTC (rev 152864)
@@ -4,33 +4,30 @@
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.3.90
+pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection')
+depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity')
 makedepends=('intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cd5977d86a100d89cfef557c22900b6d061730e2bda66e314e4943505d2bd5a1')
+sha256sums=('4f883cdb55620c445c137540fc1991a38f4f472e18060b4c3eb1fa32827c1c44')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/mutter \
-      --localstatedir=/var --disable-static
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  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 mutter "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }

Modified: mutter.install
===================================================================
--- mutter.install	2012-03-10 12:43:37 UTC (rev 152863)
+++ mutter.install	2012-03-10 12:44:39 UTC (rev 152864)
@@ -1,17 +1,19 @@
 pkgname=mutter
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+    glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-  pre_remove $1
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        /usr/sbin/gconfpkg --uninstall $pkgname
+    fi
 }
 
 post_upgrade() {
-  post_install $1
+    post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+post_remove() {
+    post_install
 }