[arch-commits] CVS update of extra/gnome/metacity (PKGBUILD metacity.install)
Jan de Groot
jgc at archlinux.org
Sun Apr 22 15:10:54 UTC 2007
Date: Sunday, April 22, 2007 @ 11:10:54
Author: jgc
Path: /home/cvs-extra/extra/gnome/metacity
Modified: PKGBUILD (1.31 -> 1.32) metacity.install (1.7 -> 1.8)
upgpkg: metacity 2.18.2-2
Move to /usr
------------------+
PKGBUILD | 18 +++++++++---------
metacity.install | 18 +++++++-----------
2 files changed, 16 insertions(+), 20 deletions(-)
Index: extra/gnome/metacity/PKGBUILD
diff -u extra/gnome/metacity/PKGBUILD:1.31 extra/gnome/metacity/PKGBUILD:1.32
--- extra/gnome/metacity/PKGBUILD:1.31 Mon Apr 9 16:35:04 2007
+++ extra/gnome/metacity/PKGBUILD Sun Apr 22 11:10:54 2007
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD,v 1.31 2007/04/09 20:35:04 jgc Exp $
+# $Id: PKGBUILD,v 1.32 2007/04/22 15:10:54 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=metacity
pkgver=2.18.2
-pkgrel=1
+pkgrel=2
pkgdesc="A window manager for GNOME2"
arch=(i686 x86_64)
license=('GPL')
-depends=('startup-notification>=0.9' 'gconf>=2.18.0.1')
+depends=('startup-notification>=0.9' 'gconf>=2.18.0.1-2')
makedepends=('perlxml' 'pkgconfig')
url="http://www.gnome.org"
groups=('gnome')
@@ -17,14 +17,14 @@
md5sums=('45cdadd7d6213aeca3d9f1acc1d1d70f')
build() {
- [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
cd ${startdir}/src/${pkgname}-${pkgver}
- ./configure --prefix=/opt/gnome --mandir=/opt/gnome/man --disable-static
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib/metacity \
+ --localstatedir=/var --disable-static
make || return 1
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
- mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
- gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
- rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
+ mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
+ gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+ rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
}
Index: extra/gnome/metacity/metacity.install
diff -u extra/gnome/metacity/metacity.install:1.7 extra/gnome/metacity/metacity.install:1.8
--- extra/gnome/metacity/metacity.install:1.7 Sun Mar 19 07:36:08 2006
+++ extra/gnome/metacity/metacity.install Sun Apr 22 11:10:54 2007
@@ -1,10 +1,8 @@
pkgname=metacity
post_install() {
- export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
- opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
-
- update-desktop-database -q
+ 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
}
pre_upgrade() {
@@ -16,19 +14,17 @@
}
pre_remove() {
- if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+ 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=`opt/gnome/bin/gconftool-2 --get-default-source`
-
- opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
-}
+ export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-post_remove() {
- update-desktop-database -q
+ usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
}
op=$1
More information about the arch-commits
mailing list