[arch-commits] Commit in metacity/repos (5 files)

[Ionut Biru]

    Date: Monday, April 23, 2012 @ 05:09:17
  Author: ibiru
Revision: 156930

db-move: moved metacity from [testing] to [extra] (x86_64)

Added:
  metacity/repos/extra-x86_64/PKGBUILD
    (from rev 156695, metacity/repos/testing-x86_64/PKGBUILD)
  metacity/repos/extra-x86_64/metacity.install
    (from rev 156695, metacity/repos/testing-x86_64/metacity.install)
Deleted:
  metacity/repos/extra-x86_64/PKGBUILD
  metacity/repos/extra-x86_64/metacity.install
  metacity/repos/testing-x86_64/

------------------+
 PKGBUILD         |   65 +++++++++++++++++++++++++----------------------------
 metacity.install |   36 +++++++++++++++--------------
 2 files changed, 50 insertions(+), 51 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-04-23 09:09:16 UTC (rev 156929)
+++ extra-x86_64/PKGBUILD	2012-04-23 09:09:17 UTC (rev 156930)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=metacity
-pkgver=2.34.1
-pkgrel=2
-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')
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/metacity \
-      --localstatedir=/var --disable-static
-  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
-}

Copied: metacity/repos/extra-x86_64/PKGBUILD (from rev 156695, metacity/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-04-23 09:09:17 UTC (rev 156930)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=metacity
+pkgver=2.34.3
+pkgrel=1
+pkgdesc="A window manager for GNOME"
+arch=(i686 x86_64)
+license=('GPL')
+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=('aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7')
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/metacity \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/metacity.install
===================================================================
--- extra-x86_64/metacity.install	2012-04-23 09:09:16 UTC (rev 156929)
+++ extra-x86_64/metacity.install	2012-04-23 09:09:17 UTC (rev 156930)
@@ -1,17 +0,0 @@
-pkgname=metacity
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}

Copied: metacity/repos/extra-x86_64/metacity.install (from rev 156695, metacity/repos/testing-x86_64/metacity.install)
===================================================================
--- extra-x86_64/metacity.install	                        (rev 0)
+++ extra-x86_64/metacity.install	2012-04-23 09:09:17 UTC (rev 156930)
@@ -0,0 +1,19 @@
+pkgname=metacity
+
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+pre_upgrade() {
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        /usr/sbin/gconfpkg --uninstall $pkgname
+    fi
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}