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

[Jan Steffens]

    Date: Tuesday, March 29, 2011 @ 01:51:43
  Author: heftig
Revision: 117161

upgpkg: gnome-panel 2.91.93-1
Update to 2.91.93

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

---------------------+
 PKGBUILD            |    8 ++++----
 gnome-panel.install |   18 ++++--------------
 2 files changed, 8 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-29 05:29:18 UTC (rev 117160)
+++ PKGBUILD	2011-03-29 05:51:43 UTC (rev 117161)
@@ -2,19 +2,19 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=2.91.92
+pkgver=2.91.93
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="The GNOME Panel"
 url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
+depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf')
+makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra' 'namcap')
 install=gnome-panel.install
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('298dc2f4b07eeb409679ec13b1c49408b6ed9917af477a915f52f0ca88823331')
+sha256sums=('ad04f35782e6d2420c537d2a91a8c4419350fd45b7753fefed3b1b56bd4e31cb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: gnome-panel.install
===================================================================
--- gnome-panel.install	2011-03-29 05:29:18 UTC (rev 117160)
+++ gnome-panel.install	2011-03-29 05:51:43 UTC (rev 117161)
@@ -1,34 +1,24 @@
 pkgname=gnome-panel
 
 post_install() {
-  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
-	etc/gconf/schemas/panel-default-setup.entries >/dev/null
   usr/sbin/gconfpkg --install ${pkgname}
-
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+  pre_remove
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 pre_remove() {
-  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  if [ -f opt/gnome/etc/gconf/schemas/panel-default-setup.entries ]; then
-    usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
-	opt/gnome/etc/gconf/schemas/panel-default-setup.entries >/dev/null
-  else
-    usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
-        etc/gconf/schemas/panel-default-setup.entries > /dev/null
-  fi
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }