[arch-commits] CVS update of extra/gnome/gnome-panel (PKGBUILD gnome-panel.install)

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 06:33:43
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-panel

Modified: PKGBUILD (1.42 -> 1.43) gnome-panel.install (1.14 -> 1.15)

upgpkg: gnome-panel 2.18.3-1
Migrate to gconfpkg as much as possible


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


Index: extra/gnome/gnome-panel/PKGBUILD
diff -u extra/gnome/gnome-panel/PKGBUILD:1.42 extra/gnome/gnome-panel/PKGBUILD:1.43
--- extra/gnome/gnome-panel/PKGBUILD:1.42	Fri Jun  1 05:31:21 2007
+++ extra/gnome/gnome-panel/PKGBUILD	Sat Jul  7 06:33:42 2007
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD,v 1.42 2007/06/01 09:31:21 jgc Exp $
+# $Id: PKGBUILD,v 1.43 2007/07/07 10:33:42 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=2.18.2
+pkgver=2.18.3
 pkgrel=1
 pkgdesc="The GNOME Panel"
-depends=('libwnck>=2.18.0-2' 'gnome-menus>=2.18.0-2' 'evolution-data-server>=1.10.1-2' 'gnome-desktop>=2.18.1' 'scrollkeeper')
+depends=('libwnck>=2.18.0-2' 'gnome-menus>=2.18.0-2' 'evolution-data-server>=1.10.1-2' 'gnome-desktop>=2.18.1' 'scrollkeeper' 'gconf>=2.18.0.1-4')
 arch=(i686 x86_64)
 makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'pkgconfig')
 options=('!libtool')
@@ -14,7 +14,7 @@
 license=('GPL')
 install=gnome-panel.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5db34402d672afd41870946c38092b7f')
+md5sums=('545348de234fa8222e328fa7f3a5ba71')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
Index: extra/gnome/gnome-panel/gnome-panel.install
diff -u extra/gnome/gnome-panel/gnome-panel.install:1.14 extra/gnome/gnome-panel/gnome-panel.install:1.15
--- extra/gnome/gnome-panel/gnome-panel.install:1.14	Sun Apr 22 11:02:41 2007
+++ extra/gnome/gnome-panel/gnome-panel.install	Sat Jul  7 06:33:42 2007
@@ -1,10 +1,8 @@
 pkgname=gnome-panel
 
 post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
   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
-
   usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --load \
 	etc/gconf/schemas/panel-default-setup.entries >/dev/null
 
@@ -21,23 +19,14 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f 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
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 
   export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
-
   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 \
+    usr/bin/gconftool-2 --config-source="${GCONF_CONFIG_SOURCE}" --direct --unload \
         etc/gconf/schemas/panel-default-setup.entries > /dev/null
   fi
 }