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

[Jan de Groot]

    Date: Tuesday, March 26, 2013 @ 14:16:59
  Author: jgc
Revision: 180825

upgpkg: gnome-terminal 3.8.0-1

Modified:
  gnome-terminal/trunk/PKGBUILD
  gnome-terminal/trunk/gnome-terminal.install

------------------------+
 PKGBUILD               |   15 ++++++---------
 gnome-terminal.install |   12 ++++--------
 2 files changed, 10 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-26 13:07:51 UTC (rev 180824)
+++ PKGBUILD	2013-03-26 13:16:59 UTC (rev 180825)
@@ -7,9 +7,10 @@
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl' 'desktop-file-utils' 'python' 'nautilus')
-optdepends=('nautilus: Terminal extension for nautilus')
+depends=('vte3' 'gsettings-desktop-schemas' 'libsm' 'dconf')
+makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl' 'desktop-file-utils' 'libnautilus-extension' 'python2' 'gconf')
+optdepends=('libnautilus-extension: Terminal extension for nautilus'
+            'gconf: settings migration when upgrading from older version')
 replaces=('nautilus-open-terminal')
 conflicts=('nautilus-open-terminal')
 options=('!emptydirs')
@@ -22,15 +23,11 @@
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
+      --localstatedir=/var --libexecdir=/usr/lib/gnome-terminal
   make
 }
 
 package() {
   cd "$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 gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+  make DESTDIR="$pkgdir" install
 }

Modified: gnome-terminal.install
===================================================================
--- gnome-terminal.install	2013-03-26 13:07:51 UTC (rev 180824)
+++ gnome-terminal.install	2013-03-26 13:16:59 UTC (rev 180825)
@@ -1,17 +1,13 @@
-pkgname=gnome-terminal
-
 post_install() {
-  gconfpkg --install $pkgname
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if [ -f /usr/share/gconf/schemas/gnome-terminal.schemas ]; then
+    gconfpkg --uninstall gnome-terminal
+  fi
 }
 
 post_upgrade() {
   post_install $1
 }
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}