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

[Ionut Biru]

    Date: Friday, March 9, 2012 @ 14:29:59
  Author: ibiru
Revision: 152835

update to 2.34.2

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

------------------+
 PKGBUILD         |   25 +++++++++++--------------
 metacity.install |   12 +++++++-----
 2 files changed, 18 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2012-03-09 19:05:02 UTC (rev 152834)
+++ PKGBUILD    2012-03-09 19:29:59 UTC (rev 152835)
@@ -2,33 +2,30 @@
 # Maintainer: Jan de Groot <j...@archlinux.org>
 
 pkgname=metacity
-pkgver=2.34.1
-pkgrel=2
+pkgver=2.34.2
+pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 
'libwnck' 'libsm')
-makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
+depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra'  'libgtop' 
'libsm' 'startup-notification' 'zenity')
+makedepends=('intltool' 'gnome-doc-utils')
 url="http://www.gnome.org";
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=metacity.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('3ca1a658bc0daa8b31872b89add2c73892a5369e767cafd636f2b15bd0675ee6')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/metacity \
-      --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 metacity "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }

Modified: metacity.install
===================================================================
--- metacity.install    2012-03-09 19:05:02 UTC (rev 152834)
+++ metacity.install    2012-03-09 19:29:59 UTC (rev 152835)
@@ -1,17 +1,19 @@
 pkgname=metacity
 
 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
 }