[arch-commits] CVS update of extra/gnome/gnome-terminal (2 files)
Jan de Groot
jgc at archlinux.org
Sun Apr 22 16:15:58 UTC 2007
Date: Sunday, April 22, 2007 @ 12:15:58
Author: jgc
Path: /home/cvs-extra/extra/gnome/gnome-terminal
Modified: PKGBUILD (1.24 -> 1.25) gnome-terminal.install (1.6 -> 1.7)
upgpkg: gnome-terminal 2.18.0-2
Move to /usr
------------------------+
PKGBUILD | 27 +++++++++++++--------------
gnome-terminal.install | 14 +++++++-------
2 files changed, 20 insertions(+), 21 deletions(-)
Index: extra/gnome/gnome-terminal/PKGBUILD
diff -u extra/gnome/gnome-terminal/PKGBUILD:1.24 extra/gnome/gnome-terminal/PKGBUILD:1.25
--- extra/gnome/gnome-terminal/PKGBUILD:1.24 Wed Mar 21 14:01:56 2007
+++ extra/gnome/gnome-terminal/PKGBUILD Sun Apr 22 12:15:58 2007
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD,v 1.24 2007/03/21 18:01:56 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.25 2007/04/22 16:15:58 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-terminal
pkgver=2.18.0
-pkgrel=1
+pkgrel=2
pkgdesc="The GNOME Terminal Emulator"
-arch=(i686)
-depends=('libgnomeui>=2.18.1' 'vte>=0.16.0' 'startup-notification>=0.9')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils')
+arch=(i686 x86_64)
+license=('GPL')
+depends=('libgnomeui>=2.18.1-2' 'vte>=0.16.1-2' 'startup-notification>=0.9' 'scrollkeeper')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.10.3')
url="http://www.gnome.org"
groups=('gnome-extra')
-license=(GPL)
install=gnome-terminal.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
md5sums=('15ba4f3a9851d63d8c06b8f67210dde9')
build() {
- [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
cd ${startdir}/src/${pkgname}-${pkgver}
- find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
if [ -f omf.make ]; then
+ find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
sed -i -e 's/-scrollkeeper-update.*//' omf.make
fi
- ./configure --prefix=/opt/gnome --disable-scrollkeeper
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-scrollkeeper
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/gnome-terminal/gnome-terminal.install
diff -u extra/gnome/gnome-terminal/gnome-terminal.install:1.6 extra/gnome/gnome-terminal/gnome-terminal.install:1.7
--- extra/gnome/gnome-terminal/gnome-terminal.install:1.6 Sun Mar 19 07:25:10 2006
+++ extra/gnome/gnome-terminal/gnome-terminal.install Sun Apr 22 12:15:58 2007
@@ -1,10 +1,9 @@
pkgname=gnome-terminal
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
+ 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
scrollkeeper-update -q -p var/lib/scrollkeeper
- update-desktop-database -q
}
pre_upgrade() {
@@ -16,18 +15,19 @@
}
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`
+ export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
- opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+ usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
}
post_remove() {
- update-desktop-database -q
scrollkeeper-update -q -p var/lib/scrollkeeper
}
More information about the arch-commits
mailing list